Skip to content

GUI: Check for null TheWindowManager before creating layouts #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
x64-dev merged 2 commits into from
Oct 10, 2025
Merged

GUI: Check for null TheWindowManager before creating layouts #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7ce01f
GUI: Check for null TheWindowManager before creating layouts
seer-by-sentry[bot] Oct 5, 2025
5f4393f
Merge branch 'main' into seer/gui-window-manager-check
x64-dev Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,7 +841,7 @@ WindowLayout *Shell::getSaveLoadMenuLayout( void )
{

// if layout has not been created, create it now
if( m_saveLoadMenuLayout == NULL )
if( m_saveLoadMenuLayout == NULL && TheWindowManager != NULL )
m_saveLoadMenuLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/PopupSaveLoad.wnd" ) );

// sanity
Expand All @@ -858,7 +858,7 @@ WindowLayout *Shell::getPopupReplayLayout( void )
{

// if layout has not been created, create it now
if( m_popupReplayLayout == NULL )
if( m_popupReplayLayout == NULL && TheWindowManager != NULL )
m_popupReplayLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/PopupReplay.wnd" ) );

// sanity
Expand Down
8 changes: 4 additions & 4 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,8 +848,8 @@ WindowLayout* Shell::getSaveLoadMenuLayout(void)
{

// if layout has not been created, create it now
if (m_saveLoadMenuLayout == NULL)
m_saveLoadMenuLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/PopupSaveLoad.wnd"));
if( m_saveLoadMenuLayout == NULL && TheWindowManager != NULL )
m_saveLoadMenuLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/PopupSaveLoad.wnd" ) );

// sanity
DEBUG_ASSERTCRASH(m_saveLoadMenuLayout, ("Unable to create save/load menu layout"));
Expand All @@ -865,8 +865,8 @@ WindowLayout* Shell::getPopupReplayLayout(void)
{

// if layout has not been created, create it now
if (m_popupReplayLayout == NULL)
m_popupReplayLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/PopupReplay.wnd"));
if( m_popupReplayLayout == NULL && TheWindowManager != NULL )
m_popupReplayLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/PopupReplay.wnd" ) );

// sanity
DEBUG_ASSERTCRASH(m_popupReplayLayout, ("Unable to create replay save menu layout"));
Expand Down
Loading