gameui: fix disconnect in video settings for multiplayer games

This commit is contained in:
nillerusr 2023-10-08 02:40:43 +03:00
parent 035861bf52
commit 047f8b1185
2 changed files with 4 additions and 4 deletions

View File

@ -508,7 +508,7 @@ public:
if ( panel == m_pDXLevel && RequiresRestart() ) if ( panel == m_pDXLevel && RequiresRestart() )
{ {
// notify the user that this will require a disconnect // notify the user that this will require a disconnect
QueryBox *box = new QueryBox("#GameUI_SettingRequiresDisconnect_Title", "#GameUI_SettingRequiresDisconnect_Info"); QueryBox *box = new QueryBox("#GameUI_SettingRequiresDisconnect_Title", "#GameUI_SettingRequiresDisconnect_Info", this);
box->AddActionSignalTarget( this ); box->AddActionSignalTarget( this );
box->SetCancelCommand(new KeyValues("ResetDXLevelCombo")); box->SetCancelCommand(new KeyValues("ResetDXLevelCombo"));
box->DoModal(); box->DoModal();

View File

@ -239,9 +239,9 @@ def define_platform(conf):
'_DLL_EXT=.so' '_DLL_EXT=.so'
]) ])
if conf.env.DEST_OS != 'win32': # if conf.env.DEST_OS != 'win32':
conf.define('NO_MALLOC_OVERRIDE', 1) # conf.define('NO_MALLOC_OVERRIDE', 1)
conf.define('NO_MEMOVERRIDE_NEW_DELETE', 1) # conf.define('NO_MEMOVERRIDE_NEW_DELETE', 1)
if conf.options.DEBUG_ENGINE: if conf.options.DEBUG_ENGINE:
conf.env.append_unique('DEFINES', [ conf.env.append_unique('DEFINES', [