From: Thomas Debesse <dev@illwieckz.net>
Date: Tue, 21 Jun 2022 04:08:40 +0000 (+0200)
Subject: Merge commit '1644eeece07040927ced5628e3922774576c64c9' into master-merge
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=59d46c47dd0d80a344748773bd4c92b619bf4f63;p=xonotic%2Fnetradiant.git

Merge commit '1644eeece07040927ced5628e3922774576c64c9' into master-merge
---

59d46c47dd0d80a344748773bd4c92b619bf4f63
diff --cc radiant/multimon.cpp
index 869bc1d8,abde2ec2..f7c7006f
--- a/radiant/multimon.cpp
+++ b/radiant/multimon.cpp
@@@ -33,11 -33,11 +33,11 @@@ multimon_globals_t g_multimon_globals
  
  void MultiMonitor_constructPreferences( PreferencesPage& page ){
  	ui::CheckButton primary_monitor = page.appendCheckBox( "Multi Monitor", "Start on Primary Monitor", g_multimon_globals.m_bStartOnPrimMon );
- 	ui::CheckButton popup = page.appendCheckBox(
- 		"", "Disable system menu on popup windows",
- 		make_property( g_Multimon_enableSysMenuPopups )
- 		);
- 	Widget_connectToggleDependency( popup, primary_monitor );
+ //	ui::CheckButton popup = page.appendCheckBox(
+ //		"", "Disable system menu on popup windows",
 -//		mkImportExportCallback( g_Multimon_enableSysMenuPopups )
++//		make_property( g_Multimon_enableSysMenuPopups )
+ //		);
+ //	Widget_connectToggleDependency( popup, primary_monitor );
  }
  
  #include "preferencesystem.h"