Fix Main Menu Control Bar resolution change/resize glitch via robust state restoration without using early-exit guards

githubawn · githubawn · commit c3281c4744f7 · 2026-05-20T17:39:48.000+02:00
diff --git a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp
@@ -5823,16 +5823,11 @@ void InGameUI::resetIdleWorker()
 void InGameUI::recreateControlBar()
 {
 	GameWindow *parent = TheWindowManager->winGetWindowFromId(nullptr, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"));
-	if (!parent)
-	{
-		return;
-	}
-	Bool wasVisible = !parent->winIsHidden();
+	Bool wasVisible = (parent && !parent->winIsHidden());
 
-	GameWindow *win = TheWindowManager->winGetWindowFromId(nullptr, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"));
-	if (win)
+	if (parent)
 	{
-		TheWindowManager->winDestroy(win);
+		TheWindowManager->winDestroy(parent);
 	}
 
 	m_idleWorkerWin = nullptr;
@@ -5853,6 +5848,10 @@ void InGameUI::recreateControlBar()
 	{
 		ShowControlBar(TRUE);
 	}
+	else
+	{
+		HideControlBar(TRUE);
+	}
 }
 
 void InGameUI::refreshCustomUiResources()
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp
@@ -5996,16 +5996,11 @@ void InGameUI::resetIdleWorker()
 void InGameUI::recreateControlBar()
 {
 	GameWindow *parent = TheWindowManager->winGetWindowFromId(nullptr, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"));
-	if (!parent)
-	{
-		return;
-	}
-	Bool wasVisible = !parent->winIsHidden();
+	Bool wasVisible = (parent && !parent->winIsHidden());
 
-	GameWindow *win = TheWindowManager->winGetWindowFromId(nullptr, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"));
-	if (win)
+	if (parent)
 	{
-		TheWindowManager->winDestroy(win);
+		TheWindowManager->winDestroy(parent);
 	}
 
 	m_idleWorkerWin = nullptr;
@@ -6026,6 +6021,10 @@ void InGameUI::recreateControlBar()
 	{
 		ShowControlBar(TRUE);
 	}
+	else
+	{
+		HideControlBar(TRUE);
+	}
 }
 
 void InGameUI::refreshCustomUiResources()

Original file line number	Diff line number	Diff line change
`@@ -5823,16 +5823,11 @@ void InGameUI::resetIdleWorker()`
`5823`	`5823`	`void InGameUI::recreateControlBar()`
`5824`	`5824`	`{`
`5825`	`5825`	`GameWindow *parent = TheWindowManager->winGetWindowFromId(nullptr, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"));`
`5826`		`- if (!parent)`
`5827`		`- {`
`5828`		`- return;`
`5829`		`- }`
`5830`		`- Bool wasVisible = !parent->winIsHidden();`
	`5826`	`+ Bool wasVisible = (parent && !parent->winIsHidden());`
`5831`	`5827`
`5832`		`- GameWindow *win = TheWindowManager->winGetWindowFromId(nullptr, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"));`
`5833`		`- if (win)`
	`5828`	`+ if (parent)`
`5834`	`5829`	`{`
`5835`		`- TheWindowManager->winDestroy(win);`
	`5830`	`+ TheWindowManager->winDestroy(parent);`
`5836`	`5831`	`}`
`5837`	`5832`
`5838`	`5833`	`m_idleWorkerWin = nullptr;`
`@@ -5853,6 +5848,10 @@ void InGameUI::recreateControlBar()`
`5853`	`5848`	`{`
`5854`	`5849`	`ShowControlBar(TRUE);`
`5855`	`5850`	`}`
	`5851`	`+ else`
	`5852`	`+ {`
	`5853`	`+ HideControlBar(TRUE);`
	`5854`	`+ }`
`5856`	`5855`	`}`
`5857`	`5856`
`5858`	`5857`	`void InGameUI::refreshCustomUiResources()`
Original file line number	Diff line number	Diff line change
`@@ -5996,16 +5996,11 @@ void InGameUI::resetIdleWorker()`
`5996`	`5996`	`void InGameUI::recreateControlBar()`
`5997`	`5997`	`{`
`5998`	`5998`	`GameWindow *parent = TheWindowManager->winGetWindowFromId(nullptr, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"));`
`5999`		`- if (!parent)`
`6000`		`- {`
`6001`		`- return;`
`6002`		`- }`
`6003`		`- Bool wasVisible = !parent->winIsHidden();`
	`5999`	`+ Bool wasVisible = (parent && !parent->winIsHidden());`
`6004`	`6000`
`6005`		`- GameWindow *win = TheWindowManager->winGetWindowFromId(nullptr, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"));`
`6006`		`- if (win)`
	`6001`	`+ if (parent)`
`6007`	`6002`	`{`
`6008`		`- TheWindowManager->winDestroy(win);`
	`6003`	`+ TheWindowManager->winDestroy(parent);`
`6009`	`6004`	`}`
`6010`	`6005`
`6011`	`6006`	`m_idleWorkerWin = nullptr;`
`@@ -6026,6 +6021,10 @@ void InGameUI::recreateControlBar()`
`6026`	`6021`	`{`
`6027`	`6022`	`ShowControlBar(TRUE);`
`6028`	`6023`	`}`
	`6024`	`+ else`
	`6025`	`+ {`
	`6026`	`+ HideControlBar(TRUE);`
	`6027`	`+ }`
`6029`	`6028`	`}`
`6030`	`6029`
`6031`	`6030`	`void InGameUI::refreshCustomUiResources()`