Skip to content

Commit 5ddfff2

Browse files
authored
Merge pull request #460 from MrS-ibra/bugfix/disable-online-resolution-change
bugfix(optionsmenu): Prevent crashes with the Online Options Menu by disabling the resolution combo box
2 parents 2e88671 + aadf7f6 commit 5ddfff2

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

  • GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@
7777
#include "ww3d.h"
7878
#include "texturefilter.h"
7979

80+
#include "../OnlineServices_Init.h"
81+
8082
// This is for non-RC builds only!!!
8183
#define VERBOSE_VERSION L"Release"
8284

@@ -1409,7 +1411,7 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
14091411
GameWindow *parent = TheWindowManager->winGetWindowFromId( nullptr, parentID );
14101412
TheWindowManager->winSetFocus( parent );
14111413

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

0 commit comments

Comments
 (0)