[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] [pingus] push by address@hidden - Fixed crash when LANG is
From: |
pingus |
Subject: |
[Pingus-CVS] [pingus] push by address@hidden - Fixed crash when LANG is not set on 2011-09-09 12:55 GMT |
Date: |
Fri, 09 Sep 2011 13:11:58 +0000 |
Revision: 5c2fdc95efa1
Author: Ingo Ruhnke <address@hidden>
Date: Fri Sep 9 05:55:16 2011
Log: Fixed crash when LANG is not set
http://code.google.com/p/pingus/source/detail?r=5c2fdc95efa1
Modified:
/src/util/system.cpp
=======================================
--- /src/util/system.cpp Thu Sep 8 20:04:15 2011
+++ /src/util/system.cpp Fri Sep 9 05:55:16 2011
@@ -406,19 +406,30 @@
#else
char* lang_c = setlocale(LC_MESSAGES, NULL);
#endif
-
std::string lang;
if (lang_c)
+ {
lang = lang_c;
+ }
if (lang.empty() || lang == "C")
- lang = getenv("LANG");
+ {
+ lang_c = getenv("LANG");
+ if (lang_c)
+ {
+ lang = lang_c;
+ }
+ }
if (lang.empty() || lang == "C")
+ {
return globals::default_language;
+ }
else
+ {
return lang.substr(0, 2);
+ }
}
std::string
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] [pingus] push by address@hidden - Fixed crash when LANG is not set on 2011-09-09 12:55 GMT,
pingus <=