Prevent segfault when locale invalid, issue 2717

2015-03-19 09:39:36 +01:00
parent dc59b25b44
commit 234fc04efb
1 changed files with 4 additions and 2 deletions
--- a/rtgui/multilangmgr.cc
+++ b/rtgui/multilangmgr.cc
@@ -138,10 +138,12 @@ Glib::ustring MultiLangMgr::getOSUserLanguage() {
        }
 #endif
 #elif defined(__linux__) || defined(__APPLE__)
-    langName = TranslateRFC2Language(setlocale(LC_CTYPE,""));
+        char *tmplocale;
+        tmplocale = setlocale(LC_CTYPE,"");
+        if(tmplocale)
+            langName = TranslateRFC2Language(tmplocale);
 #endif
    }
-
    return langName;
 }