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

sdl: fix bug on some systems where sdl would become detached from gtk window on button configuration

This commit is contained in:
punkrockguy318 2011-10-03 16:30:47 +00:00
parent 4d9d5280c9
commit 485c3f57df
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/drivers/sdl/input.cpp
View File

@ -777,11 +777,25 @@ ButtonConfigBegin()
{ {
SDL_Surface *screen; SDL_Surface *screen;
//dont shut down video subsystem if we are using gtk to prevent the sdl window from becoming detached to GTK window
// prg318 - 10-2-2011
#ifdef _GTK
int noGui;
g_config->getOption("SDL.NoGUI", &noGui);
if(noGui == 1)
{
SDL_QuitSubSystem(SDL_INIT_VIDEO);
bcpv=KillVideo();
printf("test");
}
#else
// XXX soules - why are we doing this right before KillVideo()? // XXX soules - why are we doing this right before KillVideo()?
SDL_QuitSubSystem(SDL_INIT_VIDEO); SDL_QuitSubSystem(SDL_INIT_VIDEO);
// shut down the video and joystick subsystems // shut down the video and joystick subsystems
bcpv=KillVideo(); bcpv=KillVideo();
#endif
bcpj=KillJoysticks(); bcpj=KillJoysticks();
// reactivate the video subsystem // reactivate the video subsystem
@ -791,8 +805,6 @@ ButtonConfigBegin()
} }
else { else {
#if defined(_GTK) && defined(SDL_VIDEO_DRIVER_X11) #if defined(_GTK) && defined(SDL_VIDEO_DRIVER_X11)
int noGui;
g_config->getOption("SDL.NoGUI", &noGui);
if(noGui == 0) if(noGui == 0)
{ {
while (gtk_events_pending()) while (gtk_events_pending())