From bb28afcfc337b73bff2b46ff1a1b8844e035c96e Mon Sep 17 00:00:00 2001
From: red-001 <red-001@outlook.ie>
Date: Sun, 21 Jan 2018 12:28:47 +0000
Subject: Move `setlocale` from Lua to C++.

---
 src/script/cpp_api/s_base.cpp     | 3 +++
 src/script/cpp_api/s_security.cpp | 5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/script/cpp_api/s_base.cpp b/src/script/cpp_api/s_base.cpp
index 2537d895f..c75b1c2f8 100644
--- a/src/script/cpp_api/s_base.cpp
+++ b/src/script/cpp_api/s_base.cpp
@@ -119,6 +119,9 @@ ScriptApiBase::ScriptApiBase() :
 
 	m_environment = NULL;
 	m_guiengine = NULL;
+
+	// Make sure Lua uses the right locale
+	setlocale(LC_NUMERIC, "C");
 }
 
 ScriptApiBase::~ScriptApiBase()
diff --git a/src/script/cpp_api/s_security.cpp b/src/script/cpp_api/s_security.cpp
index 5ad7947d5..66a761f4c 100644
--- a/src/script/cpp_api/s_security.cpp
+++ b/src/script/cpp_api/s_security.cpp
@@ -249,9 +249,8 @@ void ScriptApiSecurity::initializeSecurityClient()
 	static const char *os_whitelist[] = {
 		"clock",
 		"date",
-		"difftime",	
-		"time",
-		"setlocale",
+		"difftime",
+		"time"
 	};
 	static const char *debug_whitelist[] = {
 		"getinfo",
-- 
cgit v1.2.3