Merge pull request #442 from Mattiwatti/fix-redengineerrorreporter-crash

Do not flush spdlog on shutdown in the error reporter process
maximegmd · Jan 26, 2021 · da1c706 · da1c706
2 parents b035c38 + 445a337
commit da1c706
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/dllmain.cpp b/src/dllmain.cpp
@@ -87,8 +87,12 @@ static void Initialize()
 
 static void Shutdown()
 {
+    bool inGameProcess = false;
+
     if (s_modInstanceMutex)
     {
+        inGameProcess = CET::Get().GetOptions().ExeValid;
+
         MH_DisableHook(MH_ALL_HOOKS);
         MH_Uninitialize();
 
@@ -97,9 +101,12 @@ static void Shutdown()
         ReleaseMutex(s_modInstanceMutex);
     }
 
-    // flush main log (== default logger)
-    spdlog::default_logger()->flush();
-    spdlog::get("scripting")->flush();
+    if (inGameProcess)
+    {
+        // flush main log (== default logger)
+        spdlog::default_logger()->flush();
+        spdlog::get("scripting")->flush();
+    }
 }
 
 BOOL APIENTRY DllMain(HMODULE mod, DWORD ul_reason_for_call, LPVOID)