Always update map name when setting up map

Fixes map name changing to the next map name in the very specific
instance of starting a new game, playing all the way through the first
map, and then on the intermission screen, start a new game again.