From bacaec491fbca2b6ee9be2a79ce8c39bf1d9e685 Mon Sep 17 00:00:00 2001
From: Edo <edoardo.sanguineti222@gmail.com>
Date: Mon, 3 Apr 2023 13:49:37 +0200
Subject: [PATCH] [Logging]: Fix (#896)

---
 src/Components/Modules/Logger.cpp | 6 ++++--
 src/Components/Modules/Logger.hpp | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Components/Modules/Logger.cpp b/src/Components/Modules/Logger.cpp
index 3ac40ab2..69864abc 100644
--- a/src/Components/Modules/Logger.cpp
+++ b/src/Components/Modules/Logger.cpp
@@ -8,7 +8,7 @@ namespace Components
 	std::mutex Logger::MessageMutex;
 	std::vector<std::string> Logger::MessageQueue;
 
-	std::mutex Logger::LoggingMutex;
+	std::recursive_mutex Logger::LoggingMutex;
 	std::vector<Network::Address> Logger::LoggingAddresses[2];
 
 	Dvar::Var Logger::IW4x_oneLog;
@@ -223,7 +223,9 @@ namespace Components
 
 	void Logger::RedirectOSPath(const char* file, char* folder)
 	{
-		if (std::strcmp((*Game::g_log)->current.string, file) == 0)
+		const auto* g_log = (*Game::g_log) ? (*Game::g_log)->current.string : "";
+
+		if (std::strcmp(g_log, file) == 0)
 		{
 			if (std::strcmp(folder, "userraw") != 0)
 			{
diff --git a/src/Components/Modules/Logger.hpp b/src/Components/Modules/Logger.hpp
index 00d174f7..2ada2a40 100644
--- a/src/Components/Modules/Logger.hpp
+++ b/src/Components/Modules/Logger.hpp
@@ -111,7 +111,7 @@ namespace Components
 		static std::mutex MessageMutex;
 		static std::vector<std::string> MessageQueue;
 
-		static std::mutex LoggingMutex;
+		static std::recursive_mutex LoggingMutex;
 		static std::vector<Network::Address> LoggingAddresses[2];
 
 		static Dvar::Var IW4x_oneLog;