aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordexX7 <dexx@bitwatch.co>2015-03-27 01:07:49 +0100
committerdexX7 <dexx@bitwatch.co>2015-04-18 16:06:15 +0200
commitdf45564cf0ad3b591d4eb8cc2354093bcb7df14c (patch)
treeeb338c2a0e44a6ab0d22e2b219b30d980dd644bc
parent57d1f46952bb6ee5c7b1200f29e8854d3191923a (diff)
Initialization: set fallback locale as environment variable
The scope of `std::locale::global` appears to be smaller than `setenv("LC_ALL", ...)` and insufficient to fix messed up locale settings for the whole application.
-rw-r--r--src/util.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/util.cpp b/src/util.cpp
index a03f55c910..4fea18b306 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -713,18 +713,19 @@ void RenameThread(const char* name)
void SetupEnvironment()
{
+ std::locale loc("C");
// On most POSIX systems (e.g. Linux, but not BSD) the environment's locale
// may be invalid, in which case the "C" locale is used as fallback.
#if !defined(WIN32) && !defined(MAC_OSX) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
try {
- std::locale(""); // Raises a runtime error if current locale is invalid
+ loc = std::locale(""); // Raises a runtime error if current locale is invalid
} catch (const std::runtime_error&) {
- std::locale::global(std::locale("C"));
+ setenv("LC_ALL", "C", 1);
}
#endif
// The path locale is lazy initialized and to avoid deinitialization errors
// in multithreading environments, it is set explicitly by the main thread.
- boost::filesystem::path::imbue(std::locale());
+ boost::filesystem::path::imbue(loc);
}
void SetThreadPriority(int nPriority)