Skip to content

[GEN][ZH] Prevent crashing from evaluating and saving disabled options in the Options Menu #1028

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
merged 2 commits into from
Jun 12, 2025
Merged

[GEN][ZH] Prevent crashing from evaluating and saving disabled options in the Options Menu #1028

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
a7040be
[ZH] Prevent evaluating and saving disabled options in the Options Menu
xezon Jun 8, 2025
2b6d5bd
Replicate in Generals
xezon Jun 11, 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
92 changes: 53 additions & 39 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 @@ -923,11 +923,14 @@ static void saveOptions( void )

//-------------------------------------------------------------------------------------------------
// send Delay
TheWritableGlobalData->m_firewallSendDelay = GadgetCheckBoxIsChecked(checkSendDelay);
if (TheGlobalData->m_firewallSendDelay) {
(*pref)["SendDelay"] = AsciiString("yes");
} else {
(*pref)["SendDelay"] = AsciiString("no");
if (checkSendDelay && checkSendDelay->winGetEnabled())
{
TheWritableGlobalData->m_firewallSendDelay = GadgetCheckBoxIsChecked(checkSendDelay);
if (TheGlobalData->m_firewallSendDelay) {
(*pref)["SendDelay"] = AsciiString("yes");
} else {
(*pref)["SendDelay"] = AsciiString("no");
}
}

//-------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -1000,29 +1003,33 @@ static void saveOptions( void )

//-------------------------------------------------------------------------------------------------
// LOD
Bool levelChanged=FALSE;
GadgetComboBoxGetSelectedPos( comboBoxDetail, &index );
//The levels stored by the LOD Manager are inverted compared to GUI so find correct one:
switch (index) {
case HIGHDETAIL:
levelChanged=TheGameLODManager->setStaticLODLevel(STATIC_GAME_LOD_HIGH);
break;
case MEDIUMDETAIL:
levelChanged=TheGameLODManager->setStaticLODLevel(STATIC_GAME_LOD_MEDIUM);
break;
case LOWDETAIL:
levelChanged=TheGameLODManager->setStaticLODLevel(STATIC_GAME_LOD_LOW);
break;
case CUSTOMDETAIL:
levelChanged=TheGameLODManager->setStaticLODLevel(STATIC_GAME_LOD_CUSTOM);
break;
default:
DEBUG_ASSERTCRASH(FALSE,("LOD passed in was %d, %d is not a supported LOD",index,index));
break;
}
if (comboBoxDetail && comboBoxDetail->winGetEnabled())
{
Bool levelChanged=FALSE;
GadgetComboBoxGetSelectedPos( comboBoxDetail, &index );

if (levelChanged)
(*pref)["StaticGameLOD"] = TheGameLODManager->getStaticGameLODLevelName(TheGameLODManager->getStaticLODLevel());
//The levels stored by the LOD Manager are inverted compared to GUI so find correct one:
switch (index) {
case HIGHDETAIL:
levelChanged=TheGameLODManager->setStaticLODLevel(STATIC_GAME_LOD_HIGH);
break;
case MEDIUMDETAIL:
levelChanged=TheGameLODManager->setStaticLODLevel(STATIC_GAME_LOD_MEDIUM);
break;
case LOWDETAIL:
levelChanged=TheGameLODManager->setStaticLODLevel(STATIC_GAME_LOD_LOW);
break;
case CUSTOMDETAIL:
levelChanged=TheGameLODManager->setStaticLODLevel(STATIC_GAME_LOD_CUSTOM);
break;
default:
DEBUG_ASSERTCRASH(FALSE,("LOD passed in was %d, %d is not a supported LOD",index,index));
break;
}

if (levelChanged)
(*pref)["StaticGameLOD"] = TheGameLODManager->getStaticGameLODLevelName(TheGameLODManager->getStaticLODLevel());
}

//-------------------------------------------------------------------------------------------------
// Resolution
Expand All @@ -1034,12 +1041,11 @@ static void saveOptions( void )
oldDispSettings.bitDepth = TheDisplay->getBitDepth();
oldDispSettings.windowed = TheDisplay->getWindowed();

if (index < TheDisplay->getDisplayModeCount() && index >= 0)
if (comboBoxResolution && comboBoxResolution->winGetEnabled() && index < TheDisplay->getDisplayModeCount() && index >= 0)
{
TheDisplay->getDisplayModeDescription(index,&xres,&yres,&bitDepth);
if (TheGlobalData->m_xResolution != xres || TheGlobalData->m_yResolution != yres)
{

if (TheDisplay->setDisplayMode(xres,yres,bitDepth,TheDisplay->getWindowed()))
{
dispChanged = TRUE;
Expand Down Expand Up @@ -1077,19 +1083,27 @@ static void saveOptions( void )

//-------------------------------------------------------------------------------------------------
// IP address
UnsignedInt ip;
GadgetComboBoxGetSelectedPos(comboBoxLANIP, &index);
if (index>=0 && TheGlobalData)
if (comboBoxLANIP && comboBoxLANIP->winGetEnabled())
{
ip = (UnsignedInt)GadgetComboBoxGetItemData(comboBoxLANIP, index);
TheWritableGlobalData->m_defaultIP = ip;
pref->setLANIPAddress(ip);
UnsignedInt ip;
GadgetComboBoxGetSelectedPos(comboBoxLANIP, &index);
if (index>=0 && TheGlobalData)
{
ip = (UnsignedInt)GadgetComboBoxGetItemData(comboBoxLANIP, index);
TheWritableGlobalData->m_defaultIP = ip;
pref->setLANIPAddress(ip);
}
}
GadgetComboBoxGetSelectedPos(comboBoxOnlineIP, &index);
if (index>=0)

if (comboBoxOnlineIP && comboBoxOnlineIP->winGetEnabled())
{
ip = (UnsignedInt)GadgetComboBoxGetItemData(comboBoxOnlineIP, index);
pref->setOnlineIPAddress(ip);
UnsignedInt ip;
GadgetComboBoxGetSelectedPos(comboBoxOnlineIP, &index);
if (index>=0)
{
ip = (UnsignedInt)GadgetComboBoxGetItemData(comboBoxOnlineIP, index);
pref->setOnlineIPAddress(ip);
}
}

//-------------------------------------------------------------------------------------------------
Expand Down
92 changes: 53 additions & 39 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 @@ -974,11 +974,14 @@ static void saveOptions( void )

//-------------------------------------------------------------------------------------------------
// send Delay
TheWritableGlobalData->m_firewallSendDelay = GadgetCheckBoxIsChecked(checkSendDelay);
if (TheGlobalData->m_firewallSendDelay) {
(*pref)["SendDelay"] = AsciiString("yes");
} else {
(*pref)["SendDelay"] = AsciiString("no");
if (checkSendDelay && checkSendDelay->winGetEnabled())
{
TheWritableGlobalData->m_firewallSendDelay = GadgetCheckBoxIsChecked(checkSendDelay);
if (TheGlobalData->m_firewallSendDelay) {
(*pref)["SendDelay"] = AsciiString("yes");
} else {
(*pref)["SendDelay"] = AsciiString("no");
}
}

//-------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -1054,29 +1057,33 @@ static void saveOptions( void )

//-------------------------------------------------------------------------------------------------
// LOD
Bool levelChanged=FALSE;
GadgetComboBoxGetSelectedPos( comboBoxDetail, &index );
//The levels stored by the LOD Manager are inverted compared to GUI so find correct one:
switch (index) {
case HIGHDETAIL:
levelChanged=TheGameLODManager->setStaticLODLevel(STATIC_GAME_LOD_HIGH);
break;
case MEDIUMDETAIL:
levelChanged=TheGameLODManager->setStaticLODLevel(STATIC_GAME_LOD_MEDIUM);
break;
case LOWDETAIL:
levelChanged=TheGameLODManager->setStaticLODLevel(STATIC_GAME_LOD_LOW);
break;
case CUSTOMDETAIL:
levelChanged=TheGameLODManager->setStaticLODLevel(STATIC_GAME_LOD_CUSTOM);
break;
default:
DEBUG_ASSERTCRASH(FALSE,("LOD passed in was %d, %d is not a supported LOD",index,index));
break;
}
if (comboBoxDetail && comboBoxDetail->winGetEnabled())
{
Bool levelChanged=FALSE;
GadgetComboBoxGetSelectedPos( comboBoxDetail, &index );

if (levelChanged)
(*pref)["StaticGameLOD"] = TheGameLODManager->getStaticGameLODLevelName(TheGameLODManager->getStaticLODLevel());
//The levels stored by the LOD Manager are inverted compared to GUI so find correct one:
switch (index) {
case HIGHDETAIL:
levelChanged=TheGameLODManager->setStaticLODLevel(STATIC_GAME_LOD_HIGH);
break;
case MEDIUMDETAIL:
levelChanged=TheGameLODManager->setStaticLODLevel(STATIC_GAME_LOD_MEDIUM);
break;
case LOWDETAIL:
levelChanged=TheGameLODManager->setStaticLODLevel(STATIC_GAME_LOD_LOW);
break;
case CUSTOMDETAIL:
levelChanged=TheGameLODManager->setStaticLODLevel(STATIC_GAME_LOD_CUSTOM);
break;
default:
DEBUG_ASSERTCRASH(FALSE,("LOD passed in was %d, %d is not a supported LOD",index,index));
break;
}

if (levelChanged)
(*pref)["StaticGameLOD"] = TheGameLODManager->getStaticGameLODLevelName(TheGameLODManager->getStaticLODLevel());
}

//-------------------------------------------------------------------------------------------------
// Resolution
Expand All @@ -1088,12 +1095,11 @@ static void saveOptions( void )
oldDispSettings.bitDepth = TheDisplay->getBitDepth();
oldDispSettings.windowed = TheDisplay->getWindowed();

if (index < TheDisplay->getDisplayModeCount() && index >= 0)
if (comboBoxResolution && comboBoxResolution->winGetEnabled() && index < TheDisplay->getDisplayModeCount() && index >= 0)
{
TheDisplay->getDisplayModeDescription(index,&xres,&yres,&bitDepth);
if (TheGlobalData->m_xResolution != xres || TheGlobalData->m_yResolution != yres)
{

if (TheDisplay->setDisplayMode(xres,yres,bitDepth,TheDisplay->getWindowed()))
{
dispChanged = TRUE;
Expand Down Expand Up @@ -1131,19 +1137,27 @@ static void saveOptions( void )

//-------------------------------------------------------------------------------------------------
// IP address
UnsignedInt ip;
GadgetComboBoxGetSelectedPos(comboBoxLANIP, &index);
if (index>=0 && TheGlobalData)
if (comboBoxLANIP && comboBoxLANIP->winGetEnabled())
{
ip = (UnsignedInt)GadgetComboBoxGetItemData(comboBoxLANIP, index);
TheWritableGlobalData->m_defaultIP = ip;
pref->setLANIPAddress(ip);
UnsignedInt ip;
GadgetComboBoxGetSelectedPos(comboBoxLANIP, &index);
if (index>=0 && TheGlobalData)
{
ip = (UnsignedInt)GadgetComboBoxGetItemData(comboBoxLANIP, index);
TheWritableGlobalData->m_defaultIP = ip;
pref->setLANIPAddress(ip);
}
}
GadgetComboBoxGetSelectedPos(comboBoxOnlineIP, &index);
if (index>=0)

if (comboBoxOnlineIP && comboBoxOnlineIP->winGetEnabled())
{
ip = (UnsignedInt)GadgetComboBoxGetItemData(comboBoxOnlineIP, index);
pref->setOnlineIPAddress(ip);
UnsignedInt ip;
GadgetComboBoxGetSelectedPos(comboBoxOnlineIP, &index);
if (index>=0)
{
ip = (UnsignedInt)GadgetComboBoxGetItemData(comboBoxOnlineIP, index);
pref->setOnlineIPAddress(ip);
}
}

//-------------------------------------------------------------------------------------------------
Expand Down
Loading