From: Rudolf Polzer <divverent@xonotic.org>
Date: Sun, 16 Oct 2011 12:15:53 +0000 (+0200)
Subject: get rid of menu_cmd setresolution and setcompression, just use menu_cmd sync for... 
X-Git-Tag: xonotic-v0.6.0~40^2~36
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=04ad4aff9f64e55836764b61ee1cb17ece860341;p=xonotic%2Fxonotic-data.pk3dir.git

get rid of menu_cmd setresolution and setcompression, just use menu_cmd sync for that
---

diff --git a/qcsrc/menu/gamecommand.qc b/qcsrc/menu/gamecommand.qc
index f3d780b6f..7b8425c5b 100644
--- a/qcsrc/menu/gamecommand.qc
+++ b/qcsrc/menu/gamecommand.qc
@@ -74,8 +74,9 @@ void GameCommand(string theCommand)
 
 	if(argv(0) == "sync")
 	{
-		loadAllCvars(main);
 		updateCompression();
+		updateConwidths();
+		loadAllCvars(main);
 		return;
 	}
 
@@ -119,18 +120,6 @@ void GameCommand(string theCommand)
 		return;
 	}
 
-	if(argv(0) == "setresolution")
-	{
-		updateConwidths();
-		return;
-	}
-
-	if(argv(0) == "setcompression")
-	{
-		updateCompression();
-		return;
-	}
-
 	if(argv(0) == "curl")
 	{
 		float do_exec;
diff --git a/qcsrc/menu/xonotic/dialog_settings_video.c b/qcsrc/menu/xonotic/dialog_settings_video.c
index b1907b604..770811ec1 100644
--- a/qcsrc/menu/xonotic/dialog_settings_video.c
+++ b/qcsrc/menu/xonotic/dialog_settings_video.c
@@ -106,6 +106,6 @@ void XonoticVideoSettingsTab_fill(entity me)
 		me.TD(me, 1, 2, e = makeXonoticSlider(0.5, 2.0, 0.05, "r_hdr_scenebrightness"));
 
 	me.gotoRC(me, me.rows - 1, 0);
-		me.TD(me, 1, me.columns, makeXonoticCommandButton(_("Apply immediately"), '0 0 0', "menu_cmd setresolution; vid_restart; menu_restart; togglemenu; defer 0.1 \"menu_cmd videosettings\"", COMMANDBUTTON_APPLY));
+		me.TD(me, 1, me.columns, makeXonoticCommandButton(_("Apply immediately"), '0 0 0', "menu_cmd sync; vid_restart; menu_restart; togglemenu; defer 0.1 \"menu_cmd videosettings\"", COMMANDBUTTON_APPLY));
 }
 #endif