X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_firstrun.c;h=90988703e0e5f9fa491ef0759e2a95a358b7fec3;hp=67b886ec933c754897a03a3ba845abf1ce279458;hb=7f6f6ddf5a60125f13cbc906c5e29faf61310d80;hpb=d9708336de4c01e81ea08bb205093b676b7cb882

diff --git a/qcsrc/menu/xonotic/dialog_firstrun.c b/qcsrc/menu/xonotic/dialog_firstrun.c
index 67b886ec9..90988703e 100644
--- a/qcsrc/menu/xonotic/dialog_firstrun.c
+++ b/qcsrc/menu/xonotic/dialog_firstrun.c
@@ -17,18 +17,24 @@ ENDCLASS(XonoticFirstRunDialog)
 #ifdef IMPLEMENTATION
 float CheckFirstRunButton(entity me)
 {
-	if(cvar_string("_cl_name") != "Player")
+	if(cvar_string("_cl_name") != cvar_defstring("_cl_name"))
 		return 1;
-		
-	if(cvar_string("prvm_language") != prvm_language)
+
+	if(cvar_string("_menu_prvm_language") != prvm_language)
 		return 1; // OK will then reopen the dialog in another language
-		
+
 	if(cvar_string("cl_allow_uid2name") != "-1")
-		return 1; 
-		
+		return 1;
+
 	return 0;
 }
 
+void firstRun_setLanguage(entity me)
+{
+	if(prvm_language != cvar_string("_menu_prvm_language"))
+		localcmd("\nprvm_language \"$_menu_prvm_language\"; saveconfig; menu_restart\n");
+}
+
 void XonoticFirstRunDialog_fill(entity me)
 {
 	entity e;
@@ -62,20 +68,20 @@ void XonoticFirstRunDialog_fill(entity me)
 	me.TR(me);
 	me.TR(me);
 	me.TR(me);
-	
+
 	me.gotoRC(me, 3, 4); me.setFirstColumn(me, me.currentColumn);
 	me.TR(me);
 		me.TD(me, 1, 2, e = makeXonoticTextLabel(0, _("Text language:")));
 	me.TR(me);
 		me.TD(me, 6, 2, e = makeXonoticLanguageList());
 			e.name = "languageselector_firstrun";
-			e.doubleClickCommand = "prvm_language \"$_menu_prvm_language\"; saveconfig; menu_restart; togglemenu";
+			e.setLanguage = firstRun_setLanguage;
 	me.TR(me);
 	me.TR(me);
 
 	me.gotoRC(me, me.rows - 4, 0);
 	me.TD(me, 1, me.columns, e = makeXonoticTextLabel(0.5, _("Allow player statistics to use your nickname at stats.xonotic.org?")));
-	
+
 	me.gotoRC(me, me.rows - 3, 0);
 	me.TDempty(me, 1.5);
 	me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "cl_allow_uid2name", "1", ZCTX(_("ALWU2N^Yes"))));
@@ -84,7 +90,7 @@ void XonoticFirstRunDialog_fill(entity me)
 
 	// because of the language selector, this is a menu_restart!
 	me.gotoRC(me, me.rows - 1, 0);
-	me.TD(me, 1, me.columns, e = makeXonoticCommandButton(_("Save settings"), '0 0 0', "prvm_language \"$_menu_prvm_language\"; saveconfig; menu_restart; togglemenu", COMMANDBUTTON_APPLY));
+	me.TD(me, 1, me.columns, e = makeXonoticCommandButton(_("Save settings"), '0 0 0', "prvm_language \"$_menu_prvm_language\"; saveconfig; menu_restart", COMMANDBUTTON_APPLY));
 		setDependentWeird(e, CheckFirstRunButton);
 }
 #endif