diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-25 08:33:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-25 08:33:28 +0200 |
| commit | cac3f44f6e349a41615e5179e41d20f30139bf96 (patch) | |
| tree | 6f43888723996f7a2aa9eb31900e46d2aad1cf38 /platform/x11 | |
| parent | c432ce4ee15fc396b2bccbbe2661b5bd34b9bee1 (diff) | |
| parent | 653b8324223414002e198eb2a8a685903186b97e (diff) | |
Merge pull request #22415 from ibrahn/fix-late-segfault-hang
Fixed hang when segfaulting after OS object destroyed (OSX and X11)
Diffstat (limited to 'platform/x11')
| -rw-r--r-- | platform/x11/crash_handler_x11.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/platform/x11/crash_handler_x11.cpp b/platform/x11/crash_handler_x11.cpp index ab9275e49f..79c3d9aece 100644 --- a/platform/x11/crash_handler_x11.cpp +++ b/platform/x11/crash_handler_x11.cpp @@ -45,8 +45,9 @@ #include <stdlib.h> static void handle_crash(int sig) { - if (OS::get_singleton() == NULL) - return; + if (OS::get_singleton() == NULL) { + abort(); + } void *bt_buffer[256]; size_t size = backtrace(bt_buffer, 256); @@ -119,6 +120,7 @@ CrashHandler::CrashHandler() { } CrashHandler::~CrashHandler() { + disable(); } void CrashHandler::disable() { |