Skip to content

[GEN][ZH] Disable the Firewall Port Override and HTTP Proxy settings from the Options Menu when in-game #1029

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

[GEN][ZH] Disable the Firewall Port Override and HTTP Proxy settings from the Options Menu when in-game #1029

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
a4476c5
[ZH] Disable the Firewall Port Override and HTTP Proxy settings from …
xezon Jun 8, 2025
2cffe14
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
14 changes: 11 additions & 3 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 @@ -1095,7 +1095,7 @@ static void saveOptions( void )
//-------------------------------------------------------------------------------------------------
// HTTP Proxy
GameWindow *textEntryHTTPProxy = TheWindowManager->winGetWindowFromId(NULL, NAMEKEY("OptionsMenu.wnd:TextEntryHTTPProxy"));
if (textEntryHTTPProxy)
if (textEntryHTTPProxy && textEntryHTTPProxy->winGetEnabled())
{
UnicodeString uStr = GadgetTextEntryGetText(textEntryHTTPProxy);
AsciiString aStr;
Expand All @@ -1107,7 +1107,7 @@ static void saveOptions( void )
//-------------------------------------------------------------------------------------------------
// Firewall Port Override
GameWindow *textEntryFirewallPortOverride = TheWindowManager->winGetWindowFromId(NULL, NAMEKEY("OptionsMenu.wnd:TextEntryFirewallPortOverride"));
if (textEntryFirewallPortOverride)
if (textEntryFirewallPortOverride && textEntryFirewallPortOverride->winGetEnabled())
{
UnicodeString uStr = GadgetTextEntryGetText(textEntryFirewallPortOverride);
AsciiString aStr;
Expand Down Expand Up @@ -1742,18 +1742,26 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
{
// disable controls that you can't change the options for in game
comboBoxLANIP->winEnable(FALSE);

if (comboBoxOnlineIP)
comboBoxOnlineIP->winEnable(FALSE);

checkSendDelay->winEnable(FALSE);

buttonFirewallRefresh->winEnable(FALSE);

if (comboBoxDetail)
comboBoxDetail->winEnable(FALSE);


if (comboBoxResolution)
comboBoxResolution->winEnable(FALSE);

if (textEntryFirewallPortOverride)
textEntryFirewallPortOverride->winEnable(FALSE);

if (textEntryHTTPProxy)
textEntryHTTPProxy->winEnable(FALSE);

// if (checkAudioSurround)
// checkAudioSurround->winEnable(FALSE);
//
Expand Down
14 changes: 11 additions & 3 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 @@ -1149,7 +1149,7 @@ static void saveOptions( void )
//-------------------------------------------------------------------------------------------------
// HTTP Proxy
GameWindow *textEntryHTTPProxy = TheWindowManager->winGetWindowFromId(NULL, NAMEKEY("OptionsMenu.wnd:TextEntryHTTPProxy"));
if (textEntryHTTPProxy)
if (textEntryHTTPProxy && textEntryHTTPProxy->winGetEnabled())
{
UnicodeString uStr = GadgetTextEntryGetText(textEntryHTTPProxy);
AsciiString aStr;
Expand All @@ -1161,7 +1161,7 @@ static void saveOptions( void )
//-------------------------------------------------------------------------------------------------
// Firewall Port Override
GameWindow *textEntryFirewallPortOverride = TheWindowManager->winGetWindowFromId(NULL, NAMEKEY("OptionsMenu.wnd:TextEntryFirewallPortOverride"));
if (textEntryFirewallPortOverride)
if (textEntryFirewallPortOverride && textEntryFirewallPortOverride->winGetEnabled())
{
UnicodeString uStr = GadgetTextEntryGetText(textEntryFirewallPortOverride);
AsciiString aStr;
Expand Down Expand Up @@ -1812,18 +1812,26 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
{
// disable controls that you can't change the options for in game
comboBoxLANIP->winEnable(FALSE);

if (comboBoxOnlineIP)
comboBoxOnlineIP->winEnable(FALSE);

checkSendDelay->winEnable(FALSE);

buttonFirewallRefresh->winEnable(FALSE);

if (comboBoxDetail)
comboBoxDetail->winEnable(FALSE);


if (comboBoxResolution)
comboBoxResolution->winEnable(FALSE);

if (textEntryFirewallPortOverride)
textEntryFirewallPortOverride->winEnable(FALSE);

if (textEntryHTTPProxy)
textEntryHTTPProxy->winEnable(FALSE);

// if (checkAudioSurround)
// checkAudioSurround->winEnable(FALSE);
//
Expand Down
Loading