aboutsummaryrefslogtreecommitdiff
path: root/src/util.cpp
diff options
context:
space:
mode:
authordexX7 <dexx@bitwatch.co>2015-03-27 01:07:49 +0100
committerdexX7 <dexx@bitwatch.co>2015-03-27 01:57:00 +0100
commitba0fa0d9bca19c2bab34459249e4a79426683bf0 (patch)
treeb721742c7586563d04917e9ae4ed320ec077db62 /src/util.cpp
parent8e4fd0cc315cad1e2925907ef7c62549a83730a5 (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.
Diffstat (limited to 'src/util.cpp')
-rw-r--r--src/util.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/util.cpp b/src/util.cpp
index 4192e44ae1..5fef3a40dd 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -723,18 +723,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)