X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyX.cpp;h=1c0609331c64129eab055dcbae0e82807f8cc628;hb=ac3f391b46d25784f3129e24658b73c4bc15febf;hp=4038eae82d43d16aac99e3ff0db6d165e2fdac24;hpb=e8aa9311f465df6a23f47fbb6c91f5bc2733de97;p=lyx.git

diff --git a/src/LyX.cpp b/src/LyX.cpp
index 4038eae82d..1c0609331c 100644
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -233,16 +233,19 @@ Messages & LyX::messages(string const & language)
 
 void setRcGuiLanguage()
 {
-	LASSERT(singleton_, "");
+	LASSERT(singleton_, /**/);
 	if (lyxrc.gui_language == "auto")
 		return;
 	Language const * language = languages.getLanguage(lyxrc.gui_language);
-	LYXERR(Debug::LOCALE, "Setting LANGUAGE to " << language->code());
-	if (!setEnv("LANGUAGE", language->code()))
-		LYXERR(Debug::LOCALE, "\t... failed!");
+	if (language) {
+		LYXERR(Debug::LOCALE, "Setting LANGUAGE to " << language->code());
+		if (!setEnv("LANGUAGE", language->code()))
+			LYXERR(Debug::LOCALE, "\t... failed!");
+	}
 	LYXERR(Debug::LOCALE, "Setting LC_ALL to en_US");
 	if (!setEnv("LC_ALL", "en_US"))
 		LYXERR(Debug::LOCALE, "\t... failed!");
+	Messages::init();
 	singleton_->pimpl_->messages_["GUI"] = Messages();
 }