X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Flanguagelist.c;h=5be639a07559ec27058539e8c838b3526f8e8d43;hb=1095fa06ccb2d38b4387a9b07d12b299a3351e32;hp=0ea54dbcaffa1cb2fc29fae26a229095df2298c7;hpb=406b13f464e47f8ca373b6bbe8ebe3bfc0f6be44;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/languagelist.c b/qcsrc/menu/xonotic/languagelist.c
index 0ea54dbca..5be639a07 100644
--- a/qcsrc/menu/xonotic/languagelist.c
+++ b/qcsrc/menu/xonotic/languagelist.c
@@ -27,7 +27,7 @@ CLASS(XonoticLanguageList) EXTENDS(XonoticListBox)
 
 	ATTRIB(XonoticLanguageList, name, string, "languageselector") // change this to make it noninteractive (for first run dialog)
 
-	ATTRIB(XonoticLanguageList, doubleClickCommand, string, "menu_restart\ntogglemenu\ndefer 0.1 \"menu_cmd languageselect\"")
+	ATTRIB(XonoticLanguageList, doubleClickCommand, string, "prvm_language \"$_menu_prvm_language\"\nmenu_restart\nmenu_cmd languageselect")
 ENDCLASS(XonoticLanguageList)
 
 entity makeXonoticLanguageList();
@@ -85,7 +85,7 @@ void XonoticLanguageList_loadCvars(entity me)
 {
 	string s;
 	float i, n;
-	s = cvar_string("prvm_language");
+	s = cvar_string("_menu_prvm_language");
 	n = me.nItems;
 
 	// default to English
@@ -107,11 +107,14 @@ void XonoticLanguageList_loadCvars(entity me)
 			break;
 		}
 	}
+
+	// save it off (turning anything unknown into "en")
+	me.saveCvars(me);
 }
 
 void XonoticLanguageList_saveCvars(entity me)
 {
-	cvar_set("prvm_language", me.languageParameter(me, me.selectedItem, LANGPARM_ID));
+	cvar_set("_menu_prvm_language", me.languageParameter(me, me.selectedItem, LANGPARM_ID));
 }
 
 void XonoticLanguageList_clickListBoxItem(entity me, float i, vector where)
@@ -150,6 +153,7 @@ void XonoticLanguageList_getLanguages(entity me)
 	buf = buf_create();
 
 	fh = fopen("languages.txt", FILE_READ);
+	i = 0;
 	while((s = fgets(fh)))
 	{
 		n = tokenize_console(s);