X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_firstrun.c;h=90988703e0e5f9fa491ef0759e2a95a358b7fec3;hb=e6eb6e7fc36a3a243c5171b8cc3db88e823514d4;hp=01ce7ba4347edba58ea9fc77a97f5d4d11dd2c86;hpb=0f0e69c6625fc4db17559e2e47f2fdaed8298076;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_firstrun.c b/qcsrc/menu/xonotic/dialog_firstrun.c
index 01ce7ba43..90988703e 100644
--- a/qcsrc/menu/xonotic/dialog_firstrun.c
+++ b/qcsrc/menu/xonotic/dialog_firstrun.c
@@ -17,7 +17,7 @@ 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("_menu_prvm_language") != prvm_language)
@@ -29,6 +29,12 @@ float CheckFirstRunButton(entity me)
 	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;
@@ -69,7 +75,7 @@ void XonoticFirstRunDialog_fill(entity me)
 	me.TR(me);
 		me.TD(me, 6, 2, e = makeXonoticLanguageList());
 			e.name = "languageselector_firstrun";
-			e.doubleClickCommand = "prvm_language \"$_menu_prvm_language\"; saveconfig; menu_restart";
+			e.setLanguage = firstRun_setLanguage;
 	me.TR(me);
 	me.TR(me);