"Cancel" in the metagame setup screen

Leads back to main menu if a metagame has not been started, and to the metagame menu otherwise.

Author: orengg

Menus/MetagameGUI.cpp

@@ -2255,24 +2255,26 @@ void MetagameGUI::UpdateInput()
 	GUIEvent anEvent;
 	while(m_pGUIController->GetEvent(&anEvent))
     {
+		const std::string eventControlName = anEvent.GetControl()->GetName();
+
         // Commands
 		if (anEvent.GetType() == GUIEvent::Command)
         {
 			// Open game menu button pressed
 			// Most big dialog cancel buttons lead back to the game menu too
-			if (anEvent.GetControl()->GetName() == "OpenMenuButton" ||
-                anEvent.GetControl()->GetName() == "SaveCancelButton" ||
-                anEvent.GetControl()->GetName() == "LoadCancelButton" ||
-                anEvent.GetControl()->GetName() == "NewCancelButton" ||
-                anEvent.GetControl()->GetName() == "ConfirmCancelButton")
+			if (eventControlName == "OpenMenuButton" ||
+                eventControlName == "SaveCancelButton" ||
+                eventControlName == "LoadCancelButton" ||
+				(eventControlName == "NewCancelButton" && g_MetaMan.GameInProgress()) ||
+                eventControlName == "ConfirmCancelButton")
             {
                 g_MetaMan.SetSuspend(true);
                 SwitchToScreen(MENUDIALOG);
                 g_GUISound.BackButtonPressSound()->Play();
             }
 
 			// Return to main menu button pressed
-			if (anEvent.GetControl()->GetName() == "MainMenuButton")
+			else if (eventControlName == "MainMenuButton" || eventControlName == "NewCancelButton")
             {
 				//Return Metagame dialog to new game state
 				// weegee SwitchToScreen(NEWDIALOG);
@@ -2285,24 +2287,24 @@ void MetagameGUI::UpdateInput()
             }
 
 			// Open save menu button pressed
-			if (anEvent.GetControl()->GetName() == "MenuSaveButton")
+			else if (eventControlName == "MenuSaveButton")
             {
                 g_MetaMan.SetSuspend(true);
                 SwitchToScreen(SAVEDIALOG);
                 g_GUISound.ButtonPressSound()->Play();
             }
 
 			// Open load menu button pressed
-			if (anEvent.GetControl()->GetName() == "MenuLoadButton" ||
-                anEvent.GetControl()->GetName() == "NewLoadButton")
+			else if (eventControlName == "MenuLoadButton" ||
+                eventControlName == "NewLoadButton")
             {
                 g_MetaMan.SetSuspend(true);
                 SwitchToScreen(LOADDIALOG);
                 g_GUISound.ButtonPressSound()->Play();
             }
 
 			// New Game menu button pressed
-			if (anEvent.GetControl()->GetName() == "MenuNewButton")
+			else if (eventControlName == "MenuNewButton")
             {
                 g_MetaMan.SetSuspend(true);
                 SwitchToScreen(NEWDIALOG);
@@ -2311,7 +2313,7 @@ void MetagameGUI::UpdateInput()
             }
 
 			// Quit Program button pressed
-			if (anEvent.GetControl()->GetName() == "MenuQuitButton")
+			else if (eventControlName == "MenuQuitButton")
             {
                 HideAllScreens();
                 g_MetaMan.SetSuspend(true);
@@ -2322,7 +2324,7 @@ void MetagameGUI::UpdateInput()
             }
 
 			// Resume Game menu button pressed
-			if (anEvent.GetControl()->GetName() == "MenuResumeButton")
+			else if (eventControlName == "MenuResumeButton")
             {
                 g_MetaMan.SetSuspend(false);
                 // If game over, then go to new game dialog on resume
@@ -2392,7 +2394,7 @@ void MetagameGUI::UpdateInput()
             }
 
 			// Start New Game menu button pressed
-			if (anEvent.GetControl()->GetName() == "StartButton")
+			if (eventControlName == "StartButton")
             {
                 // Current game needs saved or there will be data loss, so show confirmation box
                 if (!g_MetaMan.GameIsSaved())
@@ -2409,7 +2411,7 @@ void MetagameGUI::UpdateInput()
             }
 
 			// Save game button pressed
-			if (anEvent.GetControl()->GetName() == "SaveButton")
+			if (eventControlName == "SaveButton")
             {
                 // Overwrite confirmation click has been done already
                 if (!m_NewSaveBox->GetText().empty() || m_apMetaButton[SAVENOW]->GetText() != "Save")
@@ -2443,7 +2445,7 @@ void MetagameGUI::UpdateInput()
             }
 
 			// Load game button pressed
-			if (anEvent.GetControl()->GetName() == "LoadButton" && m_pSavesToLoadCombo->GetSelectedItem())
+			if (eventControlName == "LoadButton" && m_pSavesToLoadCombo->GetSelectedItem())
             {
                 // Save this Entity selection because the ComboBox gets cleared out when the conf dlg appears, so we can't get to the selection later when we acutally decide to load the damn thing
                 m_pSelectedGameToLoad = m_pSavesToLoadCombo->GetSelectedItem()->m_pEntity;