Added isquitmenuvisible as check

githubawn · githubawn · commit c6ee10659173 · 2026-03-03T23:36:22.000+01:00
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp b/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()
diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp
@@ -3640,12 +3640,19 @@ void GameLogic::quit(Bool toDesktop)
 {
 	if (isInGame())
 	{
-        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 && !TheGameInfo->isSandbox())
+			{
+				GameMessage *msg = TheMessageStream->appendMessage(GameMessage::MSG_SELF_DESTRUCT);
+				msg->appendBooleanArgument(TRUE);
+			}
 		}
 
 		if (TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_RECORD)
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp b/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()
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp
@@ -4192,12 +4192,19 @@ void GameLogic::quit(Bool toDesktop)
 {
 	if (isInGame())
 	{
-        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 && !TheGameInfo->isSandbox())
+			{
+				GameMessage *msg = TheMessageStream->appendMessage(GameMessage::MSG_SELF_DESTRUCT);
+				msg->appendBooleanArgument(TRUE);
+			}
 		}
 
 		if (TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_RECORD)

Original file line number	Diff line number	Diff line change
`@@ -137,9 +137,9 @@ void destroyQuitMenu()`
`137`	`137`	`*/`
`138`	`138`	`static void exitQuitMenu()`
`139`	`139`	`{`
	`140`	`+ TheGameLogic->quit(FALSE);`
`140`	`141`	`// destroy the quit menu`
`141`	`142`	`destroyQuitMenu();`
`142`		`- TheGameLogic->quit(FALSE);`
`143`	`143`	`}`
`144`	`144`	`static void noExitQuitMenu()`
`145`	`145`	`{`
`@@ -148,9 +148,9 @@ static void noExitQuitMenu()`
`148`	`148`
`149`	`149`	`static void quitToDesktopQuitMenu()`
`150`	`150`	`{`
	`151`	`+ TheGameLogic->quit(TRUE);`
`151`	`152`	`// destroy the quit menu`
`152`	`153`	`destroyQuitMenu();`
`153`		`- TheGameLogic->quit(TRUE);`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`static void surrenderQuitMenu()`
Original file line number	Diff line number	Diff line change
`@@ -3640,12 +3640,19 @@ void GameLogic::quit(Bool toDesktop)`
`3640`	`3640`	`{`
`3641`	`3641`	`if (isInGame())`
`3642`	`3642`	`{`
`3643`		`- const Bool isSandbox = TheGameInfo && TheGameInfo->isSandbox();`
`3644`		`-`
`3645`		`- if (isInMultiplayerGame() && TheGameInfo && !isSandbox)`
	`3643`	`+ if (isInInteractiveGame())`
`3646`	`3644`	`{`
`3647`		`- GameMessage *msg = TheMessageStream->appendMessage(GameMessage::MSG_SELF_DESTRUCT);`
`3648`		`- msg->appendBooleanArgument(TRUE);`
	`3645`	`+ if (!TheInGameUI->isQuitMenuVisible())`
	`3646`	`+ {`
	`3647`	`+ ToggleQuitMenu();`
	`3648`	`+ return;`
	`3649`	`+ }`
	`3650`	`+`
	`3651`	`+ if (isInMultiplayerGame() && TheGameInfo && !TheGameInfo->isSandbox())`
	`3652`	`+ {`
	`3653`	`+ GameMessage *msg = TheMessageStream->appendMessage(GameMessage::MSG_SELF_DESTRUCT);`
	`3654`	`+ msg->appendBooleanArgument(TRUE);`
	`3655`	`+ }`
`3649`	`3656`	`}`
`3650`	`3657`
`3651`	`3658`	`if (TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_RECORD)`
Original file line number	Diff line number	Diff line change
`@@ -4192,12 +4192,19 @@ void GameLogic::quit(Bool toDesktop)`
`4192`	`4192`	`{`
`4193`	`4193`	`if (isInGame())`
`4194`	`4194`	`{`
`4195`		`- const Bool isSandbox = TheGameInfo && TheGameInfo->isSandbox();`
`4196`		`-`
`4197`		`- if (isInMultiplayerGame() && TheGameInfo && !isSandbox)`
	`4195`	`+ if (isInInteractiveGame())`
`4198`	`4196`	`{`
`4199`		`- GameMessage *msg = TheMessageStream->appendMessage(GameMessage::MSG_SELF_DESTRUCT);`
`4200`		`- msg->appendBooleanArgument(TRUE);`
	`4197`	`+ if (!TheInGameUI->isQuitMenuVisible())`
	`4198`	`+ {`
	`4199`	`+ ToggleQuitMenu();`
	`4200`	`+ return;`
	`4201`	`+ }`
	`4202`	`+`
	`4203`	`+ if (isInMultiplayerGame() && TheGameInfo && !TheGameInfo->isSandbox())`
	`4204`	`+ {`
	`4205`	`+ GameMessage *msg = TheMessageStream->appendMessage(GameMessage::MSG_SELF_DESTRUCT);`
	`4206`	`+ msg->appendBooleanArgument(TRUE);`
	`4207`	`+ }`
`4201`	`4208`	`}`
`4202`	`4209`
`4203`	`4210`	`if (TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_RECORD)`