From 047f8b11858602f61e3e7acd50a3eafd9b3c84d6 Mon Sep 17 00:00:00 2001 From: nillerusr Date: Sun, 8 Oct 2023 02:40:43 +0300 Subject: [PATCH] gameui: fix disconnect in video settings for multiplayer games --- gameui/OptionsSubVideo.cpp | 2 +- wscript | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gameui/OptionsSubVideo.cpp b/gameui/OptionsSubVideo.cpp index 55b36bd1..05686240 100644 --- a/gameui/OptionsSubVideo.cpp +++ b/gameui/OptionsSubVideo.cpp @@ -508,7 +508,7 @@ public: if ( panel == m_pDXLevel && RequiresRestart() ) { // 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->SetCancelCommand(new KeyValues("ResetDXLevelCombo")); box->DoModal(); diff --git a/wscript b/wscript index 5767b69b..9910b29a 100644 --- a/wscript +++ b/wscript @@ -239,9 +239,9 @@ def define_platform(conf): '_DLL_EXT=.so' ]) - if conf.env.DEST_OS != 'win32': - conf.define('NO_MALLOC_OVERRIDE', 1) - conf.define('NO_MEMOVERRIDE_NEW_DELETE', 1) +# if conf.env.DEST_OS != 'win32': +# conf.define('NO_MALLOC_OVERRIDE', 1) +# conf.define('NO_MEMOVERRIDE_NEW_DELETE', 1) if conf.options.DEBUG_ENGINE: conf.env.append_unique('DEFINES', [