Merge pull request #4174

5248ff4 SetupEnvironment() - clean commit (Stuart Cardall)

1 files changed, 16 insertions, 0 deletions

diff --git a/src/util.cpp b/src/util.cpp
index 205af738d5..aa3adf89ec 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1384,3 +1384,19 @@ bool ParseInt32(const std::string& str, int32_t *out)
         n <= std::numeric_limits<int32_t>::max();
 }
 
+void SetupEnvironment()
+{
+    #ifndef WIN32
+    try
+    {
+	#if BOOST_FILESYSTEM_VERSION == 3
+            boost::filesystem::path::codecvt(); // Raises runtime error if current locale is invalid
+	#else				          // boost filesystem v2
+            std::locale();                      // Raises runtime error if current locale is invalid
+	#endif
+    } catch(std::runtime_error &e)
+    {
+        setenv("LC_ALL", "C", 1); // Force C locale
+    }
+    #endif
+}