Fixed map vote changing map early

If a vote changed the next map after an extension vote, the extension
time would be ignored.