Merge pull request #6196 from bunnei/asserts-setting

core: settings: Add setting for debug assertions and disable by default.

1 files changed, 5 insertions, 2 deletions

diff --git a/src/common/assert.cpp b/src/common/assert.cpp
index d7d91b96b..72f1121aa 100644
--- a/src/common/assert.cpp
+++ b/src/common/assert.cpp
@@ -3,9 +3,12 @@
 // Refer to the license.txt file included.
 
 #include "common/assert.h"
-
 #include "common/common_funcs.h"
 
+#include "common/settings.h"
+
 void assert_handle_failure() {
-    Crash();
+    if (Settings::values.use_debug_asserts) {
+        Crash();
+    }
 }