Skip to content

bugfix(optionsmenu): Prevent crashes with the Online Options Menu by disabling the resolution combo box #460

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
MrS-ibra wants to merge 1 commit into
base: main
Choose a base branch
from
Open

bugfix(optionsmenu): Prevent crashes with the Online Options Menu by disabling the resolution combo box #460

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
4 changes: 3 additions & 1 deletion 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 @@ -76,6 +76,8 @@

#include "ww3d.h"

#include "../OnlineServices_Init.h"

// This is for non-RC builds only!!!
#define VERBOSE_VERSION L"Release"

Expand Down Expand Up @@ -1352,7 +1354,7 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
GameWindow *parent = TheWindowManager->winGetWindowFromId( nullptr, parentID );
TheWindowManager->winSetFocus( parent );

if( (TheGameLogic->isInGame() && TheGameLogic->getGameMode() != GAME_SHELL) || TheGameSpyInfo )
if( (TheGameLogic->isInGame() && TheGameLogic->getGameMode() != GAME_SHELL) || NGMP_OnlineServicesManager::GetInstance() != nullptr)
{
// disable controls that you can't change the options for in game
comboBoxLANIP->winEnable(FALSE);
Expand Down
Loading