Added isquitmenuvisible as check

Author: githubawn

Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp

@@ -137,9 +137,9 @@ void destroyQuitMenu()
  */
 static void exitQuitMenu()
 {
+	TheGameLogic->quit(FALSE);
   // destroy the quit menu
 	destroyQuitMenu();
-	TheGameLogic->quit(FALSE);
 }
 static void noExitQuitMenu()
 {
@@ -148,9 +148,9 @@ static void noExitQuitMenu()
 
 static void quitToDesktopQuitMenu()
 {
+	TheGameLogic->quit(TRUE);
   // destroy the quit menu
 	destroyQuitMenu();
-	TheGameLogic->quit(TRUE);
 }
 
 static void surrenderQuitMenu()

Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp

@@ -3642,10 +3642,19 @@ void GameLogic::quit(Bool toDesktop)
 	{
         const Bool isSandbox = TheGameInfo && TheGameInfo->isSandbox();
 
-        if (isInMultiplayerGame() && TheGameInfo && !isSandbox)
+		if (isInInteractiveGame())
 		{
-			GameMessage *msg = TheMessageStream->appendMessage(GameMessage::MSG_SELF_DESTRUCT);
-			msg->appendBooleanArgument(TRUE);
+			if (!TheInGameUI->isQuitMenuVisible())
+			{
+				ToggleQuitMenu();
+				return;
+			}
+			
+			if (isInMultiplayerGame() && TheGameInfo && !isSandbox)
+			{
+				GameMessage *msg = TheMessageStream->appendMessage(GameMessage::MSG_SELF_DESTRUCT);
+				msg->appendBooleanArgument(TRUE);
+			}
 		}
 
 		if (TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_RECORD)

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp

@@ -137,9 +137,9 @@ void destroyQuitMenu()
  */
 static void exitQuitMenu()
 {
+	TheGameLogic->quit(FALSE);
   // destroy the quit menu
 	destroyQuitMenu();
-	TheGameLogic->quit(FALSE);
 }
 static void noExitQuitMenu()
 {
@@ -148,9 +148,9 @@ static void noExitQuitMenu()
 
 static void quitToDesktopQuitMenu()
 {
+	TheGameLogic->quit(TRUE);
   // destroy the quit menu
 	destroyQuitMenu();
-	TheGameLogic->quit(TRUE);
 }
 
 static void surrenderQuitMenu()

GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp

@@ -4194,10 +4194,19 @@ void GameLogic::quit(Bool toDesktop)
 	{
         const Bool isSandbox = TheGameInfo && TheGameInfo->isSandbox();
 
-        if (isInMultiplayerGame() && TheGameInfo && !isSandbox)
+		if (isInInteractiveGame())
 		{
-			GameMessage *msg = TheMessageStream->appendMessage(GameMessage::MSG_SELF_DESTRUCT);
-			msg->appendBooleanArgument(TRUE);
+			if (!TheInGameUI->isQuitMenuVisible())
+			{
+				ToggleQuitMenu();
+				return;
+			}
+			
+			if (isInMultiplayerGame() && TheGameInfo && !isSandbox)
+			{
+				GameMessage *msg = TheMessageStream->appendMessage(GameMessage::MSG_SELF_DESTRUCT);
+				msg->appendBooleanArgument(TRUE);
+			}
 		}
 
 		if (TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_RECORD)