Skip to content

fix(options): Prevent crash when Advanced Display window is missing #631

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

Open
sentry wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −8
Open

fix(options): Prevent crash when Advanced Display window is missing #631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,20 +880,23 @@ static void DestroyOptionsLayout() {

static void showAdvancedOptions()
{
WinAdvancedDisplay->winHide(FALSE);
if (WinAdvancedDisplay)
WinAdvancedDisplay->winHide(FALSE);
}

static void acceptAdvancedOptions()
{
WinAdvancedDisplay->winHide(TRUE);
if (WinAdvancedDisplay)
WinAdvancedDisplay->winHide(TRUE);
}

static void cancelAdvancedOptions()
{
//restore the detail selection back to initial state
GadgetComboBoxSetSelectedPos(comboBoxDetail, (Int)TheGameLODManager->getStaticLODLevel());

WinAdvancedDisplay->winHide(TRUE);
if (WinAdvancedDisplay)
WinAdvancedDisplay->winHide(TRUE);
}

// TheSuperHackers @tweak Now prints additional version information in the version label.
Expand Down Expand Up @@ -1028,7 +1031,9 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
sliderParticleCapID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ParticleCapSlider" );
sliderParticleCap = TheWindowManager->winGetWindowFromId( nullptr, sliderParticleCapID );

WinAdvancedDisplay->winHide(TRUE);
// TheSuperHackers @bugfix The advanced display window may be missing from custom or modded layouts.
if (WinAdvancedDisplay)
WinAdvancedDisplay->winHide(TRUE);

Color color = GameMakeColor(255,255,255,255);

Expand Down
13 changes: 9 additions & 4 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,20 +940,23 @@ static void DestroyOptionsLayout() {

static void showAdvancedOptions()
{
WinAdvancedDisplay->winHide(FALSE);
if (WinAdvancedDisplay)
WinAdvancedDisplay->winHide(FALSE);
}

static void acceptAdvancedOptions()
{
WinAdvancedDisplay->winHide(TRUE);
if (WinAdvancedDisplay)
WinAdvancedDisplay->winHide(TRUE);
}

static void cancelAdvancedOptions()
{
//restore the detail selection back to initial state
GadgetComboBoxSetSelectedPos(comboBoxDetail, (Int)TheGameLODManager->getStaticLODLevel());

WinAdvancedDisplay->winHide(TRUE);
if (WinAdvancedDisplay)
WinAdvancedDisplay->winHide(TRUE);
}

// TheSuperHackers @tweak Now prints additional version information in the version label.
Expand Down Expand Up @@ -1092,7 +1095,9 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
checkPropsID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckShowProps" );
checkProps = TheWindowManager->winGetWindowFromId( nullptr, checkPropsID);

sliderParticleCapID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ParticleCapSlider" );
// TheSuperHackers @bugfix The advanced display window may be missing from custom or modded layouts.
if (WinAdvancedDisplay)
WinAdvancedDisplay->winHide(TRUE);
sliderParticleCap = TheWindowManager->winGetWindowFromId( nullptr, sliderParticleCapID );

WinAdvancedDisplay->winHide(TRUE);
Expand Down
Loading