Skip to content

Commit 047f8b1

Browse files
committed
gameui: fix disconnect in video settings for multiplayer games
1 parent 035861b commit 047f8b1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Diff for: gameui/OptionsSubVideo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ class COptionsSubVideoAdvancedDlg : public vgui::Frame
508508
if ( panel == m_pDXLevel && RequiresRestart() )
509509
{
510510
// notify the user that this will require a disconnect
511-
QueryBox *box = new QueryBox("#GameUI_SettingRequiresDisconnect_Title", "#GameUI_SettingRequiresDisconnect_Info");
511+
QueryBox *box = new QueryBox("#GameUI_SettingRequiresDisconnect_Title", "#GameUI_SettingRequiresDisconnect_Info", this);
512512
box->AddActionSignalTarget( this );
513513
box->SetCancelCommand(new KeyValues("ResetDXLevelCombo"));
514514
box->DoModal();

Diff for: wscript

+3-3
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,9 @@ def define_platform(conf):
239239
'_DLL_EXT=.so'
240240
])
241241

242-
if conf.env.DEST_OS != 'win32':
243-
conf.define('NO_MALLOC_OVERRIDE', 1)
244-
conf.define('NO_MEMOVERRIDE_NEW_DELETE', 1)
242+
# if conf.env.DEST_OS != 'win32':
243+
# conf.define('NO_MALLOC_OVERRIDE', 1)
244+
# conf.define('NO_MEMOVERRIDE_NEW_DELETE', 1)
245245

246246
if conf.options.DEBUG_ENGINE:
247247
conf.env.append_unique('DEFINES', [

0 commit comments

Comments
 (0)