File tree Expand file tree Collapse file tree 2 files changed +6
-5
lines changed
GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream
Generals/Code/GameEngine/Source/GameClient/MessageStream Expand file tree Collapse file tree 2 files changed +6
-5
lines changed Original file line number Diff line number Diff line change @@ -296,8 +296,9 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
296296
297297 // process event through window system
298298 if ( TheWindowManager )
299+ {
299300 returnCode = TheWindowManager->winProcessKey ( key, state );
300-
301+ }
301302
302303 // If we're in a movie, we want to be able to escape out of it
303304 if (returnCode != WIN_INPUT_USED
@@ -314,10 +315,10 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
314315 && (key == KEY_ESC)
315316 && (BitIsSet ( state, KEY_STATE_UP )) )
316317 {
317- if ( TheGameLogic && TheGameLogic-> getLoadScreen () )
318+ if ( TheGameLogic )
318319 {
319320 LoadScreen *loadScreen = TheGameLogic->getLoadScreen ();
320- if ( loadScreen->isVideoPlaying () )
321+ if ( loadScreen && loadScreen ->isVideoPlaying () )
321322 {
322323 loadScreen->skipVideo ();
323324 returnCode = WIN_INPUT_USED;
Original file line number Diff line number Diff line change @@ -332,10 +332,10 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
332332 && (key == KEY_ESC)
333333 && (BitIsSet ( state, KEY_STATE_UP )) )
334334 {
335- if ( TheGameLogic && TheGameLogic-> getLoadScreen () )
335+ if ( TheGameLogic )
336336 {
337337 LoadScreen *loadScreen = TheGameLogic->getLoadScreen ();
338- if ( loadScreen->isVideoPlaying () )
338+ if ( loadScreen && loadScreen ->isVideoPlaying () )
339339 {
340340 loadScreen->skipVideo ();
341341 returnCode = WIN_INPUT_USED;
You can’t perform that action at this time.
0 commit comments