Review changes

Author: orengg

Menus/MainMenuGUI.cpp

@@ -636,37 +636,23 @@ void MainMenuGUI::Update()
 
     // If esc pressed, show quit dialog if applicable
 	if (g_UInputMan.KeyPressed(KEY_ESC)) {
-		if (m_MenuScreen == OPTIONSSCREEN) {
+		if (m_MenuScreen == OPTIONSSCREEN || m_MenuScreen == MODMANAGERSCREEN || m_MenuScreen == EDITORSCREEN || m_MenuScreen == CREDITSSCREEN) {
 			HideAllScreens();
 			m_MainMenuButtons[BACKTOMAIN]->SetVisible(false);
-
-			g_SettingsMan.SetFlashOnBrainDamage(m_aOptionsCheckbox[FLASHONBRAINDAMAGE]->GetCheck());
-			g_SettingsMan.SetBlipOnRevealUnseen(m_aOptionsCheckbox[BLIPONREVEALUNSEEN]->GetCheck());
-			g_SettingsMan.SetShowForeignItems(m_aOptionsCheckbox[SHOWFOREIGNITEMS]->GetCheck());
-			g_SettingsMan.SetShowToolTips(m_aOptionsCheckbox[SHOWTOOLTIPS]->GetCheck());
-			g_SettingsMan.SetPreciseCollisions(m_aOptionsCheckbox[PRECISECOLLISIONS]->GetCheck());
-			g_SettingsMan.UpdateSettingsFile();
-
-			m_MenuScreen = MAINSCREEN;
-			m_ScreenChange = true;
-
-			g_GUISound.BackButtonPressSound()->Play();
-		} else if (m_MenuScreen == MODMANAGERSCREEN) {
-			g_SettingsMan.UpdateSettingsFile();
-
-			HideAllScreens();
 			m_MenuScreen = MAINSCREEN;
 			m_ScreenChange = true;
-
 			g_GUISound.BackButtonPressSound()->Play();
-		} else if (m_MenuScreen == EDITORSCREEN || m_MenuScreen == CREDITSSCREEN) {
-			HideAllScreens();
-			m_MainMenuButtons[BACKTOMAIN]->SetVisible(false);
-
-			m_MenuScreen = MAINSCREEN;
-			m_ScreenChange = true;
 
-			g_GUISound.BackButtonPressSound()->Play();
+			if (m_MenuScreen == OPTIONSSCREEN) {
+				g_SettingsMan.SetFlashOnBrainDamage(m_aOptionsCheckbox[FLASHONBRAINDAMAGE]->GetCheck());
+				g_SettingsMan.SetBlipOnRevealUnseen(m_aOptionsCheckbox[BLIPONREVEALUNSEEN]->GetCheck());
+				g_SettingsMan.SetShowForeignItems(m_aOptionsCheckbox[SHOWFOREIGNITEMS]->GetCheck());
+				g_SettingsMan.SetShowToolTips(m_aOptionsCheckbox[SHOWTOOLTIPS]->GetCheck());
+				g_SettingsMan.SetPreciseCollisions(m_aOptionsCheckbox[PRECISECOLLISIONS]->GetCheck());
+				g_SettingsMan.UpdateSettingsFile();
+			} else if (m_MenuScreen == MODMANAGERSCREEN) {
+				g_SettingsMan.UpdateSettingsFile();
+			}
 		} else {
 			QuitLogic();
 		}