Fixed the issue with loading a map from command line

Verified that this seems to be an issue if we load a map before the game
type selection screen