Mercurial > hg > orthanc

diff Core/OrthancFramework.cpp @ 4030:100fbe970762

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DANGEROUS commit: removing HAS_EMBEDDED_RESOURCES
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 09 Jun 2020 20:50:20 +0200
parents 156fece692e3
children
line wrap: on
line diff
--- a/Core/OrthancFramework.cpp	Tue Jun 09 16:40:43 2020 +0200
+++ b/Core/OrthancFramework.cpp	Tue Jun 09 20:50:20 2020 +0200
@@ -72,7 +72,7 @@
   {
     Logging::Initialize();
 
-#if !defined(__EMSCRIPTEN__)  // No global locale in wasm/asm.js
+#if (ORTHANC_ENABLE_LOCALE == 1) && !defined(__EMSCRIPTEN__)  // No global locale in wasm/asm.js
     if (locale.empty())
     {
       Toolbox::InitializeGlobalLocale(NULL);
@@ -113,7 +113,11 @@
 #endif
     
     Toolbox::FinalizeOpenSsl();
+
+#if (ORTHANC_ENABLE_LOCALE == 1) && !defined(__EMSCRIPTEN__)
     Toolbox::FinalizeGlobalLocale();
+#endif
+    
     Logging::Finalize();
   }
 }