From 4427c066ec200ba7bc6011e4ded6e091b5971273 Mon Sep 17 00:00:00 2001 From: punkrockguy318 Date: Mon, 21 Mar 2011 18:57:00 +0000 Subject: [PATCH] gtk: remove gtk_main_quit() and manually flush gtk event queue on quit this supresses the Gtk-Critical error on fceux quit sdl: removed unneccesary newline prepending "Starting FCEUX" --- src/drivers/sdl/gui.cpp | 7 ++++++- src/drivers/sdl/sdl.cpp | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/drivers/sdl/gui.cpp b/src/drivers/sdl/gui.cpp index 42ed5542..8008741a 100644 --- a/src/drivers/sdl/gui.cpp +++ b/src/drivers/sdl/gui.cpp @@ -1070,9 +1070,14 @@ void openSoundConfig() void quit () { + // manually flush GTK event queue + while(gtk_events_pending()) + gtk_main_iteration_do(FALSE); + // this is not neccesary to be explicitly called + // it raises a GTK-Critical when its called + //gtk_main_quit(); FCEUI_Kill(); SDL_Quit(); - gtk_main_quit(); exit(0); } diff --git a/src/drivers/sdl/sdl.cpp b/src/drivers/sdl/sdl.cpp index 4a467ed8..c62de43f 100644 --- a/src/drivers/sdl/sdl.cpp +++ b/src/drivers/sdl/sdl.cpp @@ -499,7 +499,7 @@ int main(int argc, char *argv[]) { int error, frameskip; - FCEUD_Message("\nStarting "FCEU_NAME_AND_VERSION"...\n"); + FCEUD_Message("Starting "FCEU_NAME_AND_VERSION"...\n"); #ifdef WIN32 /* Taken from win32 sdl_main.c */