ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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"
This commit is contained in:
punkrockguy318 2011-03-21 18:57:00 +00:00
parent 651b5a16c2
commit 4427c066ec
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/drivers/sdl/gui.cpp
View File

@ -1070,9 +1070,14 @@ void openSoundConfig()
void quit () 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(); FCEUI_Kill();
SDL_Quit(); SDL_Quit();
gtk_main_quit();
exit(0); exit(0);
} }

2
src/drivers/sdl/sdl.cpp
View File

@ -499,7 +499,7 @@ int main(int argc, char *argv[])
{ {
int error, frameskip; int error, frameskip;
FCEUD_Message("\nStarting "FCEU_NAME_AND_VERSION"...\n"); FCEUD_Message("Starting "FCEU_NAME_AND_VERSION"...\n");
#ifdef WIN32 #ifdef WIN32
/* Taken from win32 sdl_main.c */ /* Taken from win32 sdl_main.c */