sdl: don't needlessly kill the video and input subsystems before control configuration

This commit is contained in:
plombo 2011-03-22 22:53:45 +00:00
parent 994ffdead9
commit bd87146cca
1 changed files with 1 additions and 12 deletions

View File

@ -764,14 +764,7 @@ ButtonConfigBegin()
{ {
SDL_Surface *screen; SDL_Surface *screen;
// XXX soules - why are we doing this right before KillVideo()? // activate the video subsystem if it is not already initialized
SDL_QuitSubSystem(SDL_INIT_VIDEO);
// shut down the video and joystick subsystems
bcpv=KillVideo();
bcpj=KillJoysticks();
// reactivate the video subsystem
if(!SDL_WasInit(SDL_INIT_VIDEO)) { if(!SDL_WasInit(SDL_INIT_VIDEO)) {
if(!bcpv) { if(!bcpv) {
InitVideo(GameInfo); InitVideo(GameInfo);
@ -801,10 +794,6 @@ ButtonConfigBegin()
} }
} }
// XXX soules - why did we shut this down?
// initialize the joystick subsystem
InitJoysticks();
return(1); return(1);
} }