Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Disable deadlocking fatal exception handler in Atlas

Browse Source 
This was SVN commit r11603.
This commit is contained in:
Ykkrosh 2012-04-21 14:12:37 +00:00
parent 4c372aa6d8
commit 9488ca42f6
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/tools/atlas/AtlasUI/Misc/DLLInterface.cpp
View File

@ -48,6 +48,11 @@
#include <X11/Xlib.h>
#endif
// If enabled, we'll try to use wxDebugReport to report fatal exceptions.
// But this is broken on Linux and can cause the UI to deadlock (see comment
// in OnFatalException), and it's never especially useful, so don't use it.
#define USE_WX_FATAL_EXCEPTION_REPORT 0
// Shared memory allocation functions
ATLASDLLIMPEXP void* ShareableMalloc(size_t n)
{
@ -190,7 +195,7 @@ public:
{
// _CrtSetBreakAlloc(5632);
#if wxUSE_ON_FATAL_EXCEPTION
#if wxUSE_ON_FATAL_EXCEPTION && USE_WX_FATAL_EXCEPTION_REPORT
if (! wxIsDebuggerRunning())
wxHandleFatalExceptions();
#endif
@ -272,9 +277,12 @@ public:
return true;
}
#if wxUSE_DEBUGREPORT
#if wxUSE_DEBUGREPORT && USE_WX_FATAL_EXCEPTION_REPORT
virtual void OnFatalException()
{
// NOTE: At least on Linux, this might be called from a thread other
// than the UI thread, so it's not safe to use any wx objects here
wxDebugReport report;
wxDebugReportPreviewStd preview;