SDL: Don't double-shutdown the font cache on *IX when exiting with the debugger enabled. [R. Belmont]

This commit is contained in:
R. Belmont 2013-04-29 03:09:57 +00:00
parent 2d1f849aa2
commit 192c8ee88b
2 changed files with 16 additions and 1 deletions

View File

@ -210,8 +210,14 @@ void sdl_osd_interface::init_debugger()
// Core functionality // Core functionality
//============================================================ //============================================================
#ifdef SDLMAME_UNIX
extern int sdl_entered_debugger;
#endif
void sdl_osd_interface::wait_for_debugger(device_t &device, bool firststop) void sdl_osd_interface::wait_for_debugger(device_t &device, bool firststop)
{ {
sdl_entered_debugger = 1;
// Dialog initialization // Dialog initialization
if (oneShot) if (oneShot)
{ {

View File

@ -81,6 +81,10 @@
// Global variables // Global variables
//============================================================ //============================================================
#ifdef SDLMAME_UNIX
int sdl_entered_debugger;
#endif
//============================================================ //============================================================
// Local variables // Local variables
//============================================================ //============================================================
@ -332,6 +336,7 @@ int main(int argc, char *argv[])
setvbuf(stderr, (char *) NULL, _IONBF, 0); setvbuf(stderr, (char *) NULL, _IONBF, 0);
#ifdef SDLMAME_UNIX #ifdef SDLMAME_UNIX
sdl_entered_debugger = 0;
#if (!defined(SDLMAME_MACOSX)) && (!defined(SDLMAME_HAIKU)) #if (!defined(SDLMAME_MACOSX)) && (!defined(SDLMAME_HAIKU))
if (TTF_Init() == -1) if (TTF_Init() == -1)
{ {
@ -386,7 +391,11 @@ int main(int argc, char *argv[])
#ifdef SDLMAME_UNIX #ifdef SDLMAME_UNIX
#if (!defined(SDLMAME_MACOSX)) && (!defined(SDLMAME_HAIKU)) #if (!defined(SDLMAME_MACOSX)) && (!defined(SDLMAME_HAIKU))
TTF_Quit(); TTF_Quit();
FcFini();
if (!sdl_entered_debugger)
{
FcFini();
}
#endif #endif
#endif #endif