From bd87146ccac3b8f05c8bae721f13183f98b6bfaf Mon Sep 17 00:00:00 2001 From: plombo Date: Tue, 22 Mar 2011 22:53:45 +0000 Subject: [PATCH] sdl: don't needlessly kill the video and input subsystems before control configuration --- src/drivers/sdl/input.cpp | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/drivers/sdl/input.cpp b/src/drivers/sdl/input.cpp index e6af557f..783937d4 100644 --- a/src/drivers/sdl/input.cpp +++ b/src/drivers/sdl/input.cpp @@ -763,15 +763,8 @@ int ButtonConfigBegin() { SDL_Surface *screen; - - // XXX soules - why are we doing this right before KillVideo()? - SDL_QuitSubSystem(SDL_INIT_VIDEO); - - // shut down the video and joystick subsystems - bcpv=KillVideo(); - bcpj=KillJoysticks(); - // reactivate the video subsystem + // activate the video subsystem if it is not already initialized if(!SDL_WasInit(SDL_INIT_VIDEO)) { if(!bcpv) { InitVideo(GameInfo); @@ -800,10 +793,6 @@ ButtonConfigBegin() SDL_WM_SetCaption("Button Config",0); } } - - // XXX soules - why did we shut this down? - // initialize the joystick subsystem - InitJoysticks(); return(1); }