fix(gui): prevent recreating gameplay control bar in main menu after window resize

githubawn · githubawn · commit ff0485810366 · 2026-05-20T17:09:44.000+02:00
diff --git a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp
@@ -5822,12 +5822,12 @@ void InGameUI::resetIdleWorker()
 
 void InGameUI::recreateControlBar()
 {
-	Bool wasVisible = FALSE;
 	GameWindow *parent = TheWindowManager->winGetWindowFromId(nullptr, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"));
-	if (parent)
+	if (!parent)
 	{
-		wasVisible = !parent->winIsHidden();
+		return;
 	}
+	Bool wasVisible = !parent->winIsHidden();
 
 	GameWindow *win = TheWindowManager->winGetWindowFromId(nullptr, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"));
 	if (win)
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp
@@ -5995,12 +5995,12 @@ void InGameUI::resetIdleWorker()
 
 void InGameUI::recreateControlBar()
 {
-	Bool wasVisible = FALSE;
 	GameWindow *parent = TheWindowManager->winGetWindowFromId(nullptr, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"));
-	if (parent)
+	if (!parent)
 	{
-		wasVisible = !parent->winIsHidden();
+		return;
 	}
+	Bool wasVisible = !parent->winIsHidden();
 
 	GameWindow *win = TheWindowManager->winGetWindowFromId(nullptr, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"));
 	if (win)

Original file line number	Diff line number	Diff line change
`@@ -5822,12 +5822,12 @@ void InGameUI::resetIdleWorker()`
`5822`	`5822`
`5823`	`5823`	`void InGameUI::recreateControlBar()`
`5824`	`5824`	`{`
`5825`		`- Bool wasVisible = FALSE;`
`5826`	`5825`	`GameWindow *parent = TheWindowManager->winGetWindowFromId(nullptr, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"));`
`5827`		`- if (parent)`
	`5826`	`+ if (!parent)`
`5828`	`5827`	`{`
`5829`		`- wasVisible = !parent->winIsHidden();`
	`5828`	`+ return;`
`5830`	`5829`	`}`
	`5830`	`+ Bool wasVisible = !parent->winIsHidden();`
`5831`	`5831`
`5832`	`5832`	`GameWindow *win = TheWindowManager->winGetWindowFromId(nullptr, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"));`
`5833`	`5833`	`if (win)`
Original file line number	Diff line number	Diff line change
`@@ -5995,12 +5995,12 @@ void InGameUI::resetIdleWorker()`
`5995`	`5995`
`5996`	`5996`	`void InGameUI::recreateControlBar()`
`5997`	`5997`	`{`
`5998`		`- Bool wasVisible = FALSE;`
`5999`	`5998`	`GameWindow *parent = TheWindowManager->winGetWindowFromId(nullptr, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"));`
`6000`		`- if (parent)`
	`5999`	`+ if (!parent)`
`6001`	`6000`	`{`
`6002`		`- wasVisible = !parent->winIsHidden();`
	`6001`	`+ return;`
`6003`	`6002`	`}`
	`6003`	`+ Bool wasVisible = !parent->winIsHidden();`
`6004`	`6004`
`6005`	`6005`	`GameWindow *win = TheWindowManager->winGetWindowFromId(nullptr, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"));`
`6006`	`6006`	`if (win)`