Merge pull request #486 from GeneralsOnlineDevelopmentTeam/seer/fix/gui-wol-welcome-menu-shutdown-crash

x64-dev · web-flow · commit 3eef5181f842 · 2026-05-07T16:59:53.000-04:00
bugfix(gui): Prevent use-after-free crashes in WOLWelcomeMenu during shutdown
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp
@@ -732,6 +732,12 @@ WindowMsgHandledType WOLWelcomeMenuSystem( GameWindow *window, UnsignedInt msg,
 {
 	UnicodeString txtInput;
 
+	// During shutdown the window hierarchy is being torn down; ignore all
+	// messages to prevent use-after-free crashes caused by mouse-enter/leave
+	// events that are still in-flight while the parent window is being destroyed.
+	if( isShuttingDown )
+		return MSG_IGNORED;
+
 	switch( msg )
 	{
 

Original file line number	Diff line number	Diff line change
`@@ -732,6 +732,12 @@ WindowMsgHandledType WOLWelcomeMenuSystem( GameWindow *window, UnsignedInt msg,`
`732`	`732`	`{`
`733`	`733`	`UnicodeString txtInput;`
`734`	`734`
	`735`	`+ // During shutdown the window hierarchy is being torn down; ignore all`
	`736`	`+ // messages to prevent use-after-free crashes caused by mouse-enter/leave`
	`737`	`+ // events that are still in-flight while the parent window is being destroyed.`
	`738`	`+ if( isShuttingDown )`
	`739`	`+ return MSG_IGNORED;`
	`740`	`+`
`735`	`741`	`switch( msg )`
`736`	`742`	`{`
`737`	`743`