mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-29 03:26:38 +00:00
Code Issues Releases Wiki Activity

Revert debce0fb80, use a sleep() to work around the X11 bug

Browse source 
Problem with debce0fb80 is the crashed process won't be killed until the user accepts the message box, and it's harder to get to the message box when the window is in full screen or the cursor is locked.
This commit is contained in:
scrawl 2015-11-28 05:36:57 +01:00
parent debce0fb80
commit 93a76e2f56
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/openmw/crashcatcher.cpp
View file

@ -382,7 +382,15 @@ static void crash_handler(const char *logfile)
fflush(stdout); fflush(stdout);
if(crash_info.pid > 0) if(crash_info.pid > 0)
{
gdb_info(crash_info.pid); gdb_info(crash_info.pid);
kill(crash_info.pid, SIGKILL);
}
// delay between killing of the crashed process and showing the message box to
// work around occasional X server lock-up. this can only be a bug in X11 since
// even faulty applications shouldn't be able to freeze the X server.
usleep(100000);
if(logfile) if(logfile)
{ {
@ -390,9 +398,6 @@ static void crash_handler(const char *logfile)
SDL_ShowSimpleMessageBox(0, "Fatal Error", message.c_str(), NULL); SDL_ShowSimpleMessageBox(0, "Fatal Error", message.c_str(), NULL);
} }
if (crash_info.pid > 0)
kill(crash_info.pid, SIGKILL);
exit(0); exit(0);
} }