Combine TheKeyboard and TheMessageStream conditions

bobtista · bobtista · commit 7f7537b7b832 · 2025-11-25T10:36:41.000-05:00
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp
@@ -508,14 +508,10 @@ void SinglePlayerLoadScreen::init( GameInfo *game )
 		{
 			TheGameEngine->serviceWindowsOS();
 
-			if( TheKeyboard )
+			if( TheKeyboard && TheMessageStream )
 			{
 				TheKeyboard->UPDATE();
 				TheKeyboard->createStreamMessages();
-			}
-
-			if( TheMessageStream )
-			{
 				TheMessageStream->propagateMessages();
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -508,14 +508,10 @@ void SinglePlayerLoadScreen::init( GameInfo *game )`
`508`	`508`	`{`
`509`	`509`	`TheGameEngine->serviceWindowsOS();`
`510`	`510`
`511`		`- if( TheKeyboard )`
	`511`	`+ if( TheKeyboard && TheMessageStream )`
`512`	`512`	`{`
`513`	`513`	`TheKeyboard->UPDATE();`
`514`	`514`	`TheKeyboard->createStreamMessages();`
`515`		`- }`
`516`		`-`
`517`		`- if( TheMessageStream )`
`518`		`- {`
`519`	`515`	`TheMessageStream->propagateMessages();`
`520`	`516`	`}`
`521`	`517`