Merge pull request #12471 from FearlessTobi/port-7146

 Port citra-emu/citra#7146: "assert/logging: Stop the logging thread and flush the backends before crashing"

1 files changed, 3 insertions, 0 deletions

diff --git a/src/common/assert.cpp b/src/common/assert.cpp
index 6026b7dc22..e2c2cade3f 100644
--- a/src/common/assert.cpp
+++ b/src/common/assert.cpp
@@ -3,16 +3,19 @@
 
 #include "common/assert.h"
 #include "common/common_funcs.h"
+#include "common/logging/backend.h"
 
 #include "common/settings.h"
 
 void assert_fail_impl() {
     if (Settings::values.use_debug_asserts) {
+        Common::Log::Stop();
         Crash();
     }
 }
 
 [[noreturn]] void unreachable_impl() {
+    Common::Log::Stop();
     Crash();
     throw std::runtime_error("Unreachable code");
 }