From 4361bfcb4da0b6f9de74c7de9f2d08084877713e Mon Sep 17 00:00:00 2001
From: HybridDog <3192173+HybridDog@users.noreply.github.com>
Date: Wed, 22 Apr 2020 00:07:12 +0200
Subject: Fix configuration caching in log_deprecated (#9697)

* Fix configuration caching in log_deprecated

The configured variable was never set to true.
I've set the variables to thread_local because the configuration should be reloaded after reentering the world from mainmenu.
---
 src/script/common/c_internal.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/script/common')

diff --git a/src/script/common/c_internal.cpp b/src/script/common/c_internal.cpp
index b19af9f82..6df1f8b7b 100644
--- a/src/script/common/c_internal.cpp
+++ b/src/script/common/c_internal.cpp
@@ -157,9 +157,9 @@ static void script_log(lua_State *L, const std::string &message,
 
 void log_deprecated(lua_State *L, const std::string &message, int stack_depth)
 {
-	static bool configured = false;
-	static bool do_log     = false;
-	static bool do_error   = false;
+	static thread_local bool configured = false;
+	static thread_local bool do_log = false;
+	static thread_local bool do_error = false;
 
 	// Only read settings on first call
 	if (!configured) {
@@ -167,9 +167,10 @@ void log_deprecated(lua_State *L, const std::string &message, int stack_depth)
 		if (value == "log") {
 			do_log = true;
 		} else if (value == "error") {
-			do_log   = true;
+			do_log = true;
 			do_error = true;
 		}
+		configured = true;
 	}
 
 	if (do_log)
-- 
cgit v1.2.3