gameui: fix disconnect in video settings for multiplayer games

nillerusr · Oct 7, 2023 · 047f8b1 · 047f8b1
1 parent 035861b
commit 047f8b1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/gameui/OptionsSubVideo.cpp b/gameui/OptionsSubVideo.cpp
@@ -508,7 +508,7 @@ class COptionsSubVideoAdvancedDlg : public vgui::Frame
 		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
@@ -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', [