Combine TheKeyboard and TheMessageStream conditions in GeneralsMD

bobtista · bobtista · commit 1748b1b4316c · 2025-11-25T11:21:39.000-05:00
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp
@@ -552,14 +552,12 @@ void SinglePlayerLoadScreen::init( GameInfo *game )
 		{
 			TheGameEngine->serviceWindowsOS();
 
-			if( TheKeyboard )
+			if( TheKeyboard && TheMessageStream )
 			{
 				TheKeyboard->UPDATE();
 				TheKeyboard->createStreamMessages();
-			}
-
-			if( TheMessageStream )
 				TheMessageStream->propagateMessages();
+			}
 
 			if(!m_videoStream->isFrameReady())
 			{

Original file line number	Diff line number	Diff line change
`@@ -552,14 +552,12 @@ void SinglePlayerLoadScreen::init( GameInfo *game )`
`552`	`552`	`{`
`553`	`553`	`TheGameEngine->serviceWindowsOS();`
`554`	`554`
`555`		`- if( TheKeyboard )`
	`555`	`+ if( TheKeyboard && TheMessageStream )`
`556`	`556`	`{`
`557`	`557`	`TheKeyboard->UPDATE();`
`558`	`558`	`TheKeyboard->createStreamMessages();`
`559`		`- }`
`560`		`-`
`561`		`- if( TheMessageStream )`
`562`	`559`	`TheMessageStream->propagateMessages();`
	`560`	`+ }`
`563`	`561`
`564`	`562`	`if(!m_videoStream->isFrameReady())`
`565`	`563`	`{`