From 78ed3f3be68fa9e3cd304bbd8e23e3bbdcefaa24 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 14 Jun 2004 17:04:57 +0000 Subject: [PATCH] oops; use DoEmergencyShutdown --- stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp b/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp index da0db1b817..45b1d8a7a7 100644 --- a/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp +++ b/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp @@ -6,6 +6,7 @@ #include "archutils/Unix/SignalHandler.h" #include "archutils/Unix/GetSysInfo.h" #include "archutils/Unix/LinuxThreadHelpers.h" +#include "archutils/Unix/EmergencyShutdown.h" #include #include "RageUtil.h" #include @@ -54,11 +55,7 @@ static void EmergencyShutdown( int signal, siginfo_t *si, const ucontext_t *uc ) if( !IsFatalSignal(signal) ) return; - /* If we don't actually use SDL for video, this should be a no-op. Only - * do this if the main thread crashes; trying to shut down from - * another thread causes crashes (eg. GL may be using TLS). */ - if( !strcmp(RageThread::GetCurThreadName(), "Main thread") && SDL_WasInit(SDL_INIT_VIDEO) ) - SDL_QuitSubSystem(SDL_INIT_VIDEO); + DoEmergencyShutdown(); #if defined(CRASH_HANDLER) /* If we ran the crash handler, then die. */