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/windows/crash_handler_win.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/windows/crash_handler_win.cpp')
| -rw-r--r-- | platform/windows/crash_handler_win.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/windows/crash_handler_win.cpp b/platform/windows/crash_handler_win.cpp index c9385f36d6..2f5ee7956e 100644 --- a/platform/windows/crash_handler_win.cpp +++ b/platform/windows/crash_handler_win.cpp @@ -116,7 +116,7 @@ DWORD CrashHandlerException(EXCEPTION_POINTERS *ep) { DWORD cbNeeded; std::vector<HMODULE> module_handles(1); - if (OS::get_singleton() == NULL || OS::get_singleton()->is_disable_crash_handler()) { + if (OS::get_singleton() == NULL || OS::get_singleton()->is_disable_crash_handler() || IsDebuggerPresent()) { return EXCEPTION_CONTINUE_SEARCH; } @@ -159,7 +159,7 @@ DWORD CrashHandlerException(EXCEPTION_POINTERS *ep) { IMAGE_NT_HEADERS *h = ImageNtHeader(base); DWORD image_type = h->FileHeader.Machine; int n = 0; - String msg = GLOBAL_GET("debug/settings/backtrace/message"); + String msg = GLOBAL_GET("debug/settings/crash_handler/message"); fprintf(stderr, "Dumping the backtrace. %ls\n", msg.c_str()); |