diff options
| author | Hein-Pieter van Braam <hp@tmm.cx> | 2017-09-19 11:16:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-19 11:16:47 +0200 |
| commit | 24c76f177e5702844cabef98f87ded9aa89a67e6 (patch) | |
| tree | 19d15b364137f8bd31cd74bf02318916502d2a68 /platform/x11/crash_handler_x11.cpp | |
| parent | 3d06957f12ba5c04702f3db980af9c07142e7886 (diff) | |
| parent | ff1e0a3e2cb6619644215432604293eb7ba53699 (diff) | |
Merge pull request #11395 from marcelofg55/fix_crashhandler_win
Prevent running the crash_handler when a debugger is present on windows
Diffstat (limited to 'platform/x11/crash_handler_x11.cpp')
| -rw-r--r-- | platform/x11/crash_handler_x11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/x11/crash_handler_x11.cpp b/platform/x11/crash_handler_x11.cpp index c926b7799d..419b014475 100644 --- a/platform/x11/crash_handler_x11.cpp +++ b/platform/x11/crash_handler_x11.cpp @@ -47,7 +47,7 @@ static void handle_crash(int sig) { void *bt_buffer[256]; size_t size = backtrace(bt_buffer, 256); String _execpath = OS::get_singleton()->get_executable_path(); - String msg = GLOBAL_GET("debug/settings/backtrace/message"); + String msg = GLOBAL_GET("debug/settings/crash_handler/message"); // Dump the backtrace to stderr with a message to the user fprintf(stderr, "%s: Program crashed with signal %d\n", __FUNCTION__, sig); |