From 1b1d4c3f6a72dfe050ef652694f98a86ff8c7ea4 Mon Sep 17 00:00:00 2001 From: "SND\\MaddTheSane_cp" Date: Tue, 27 Jan 2015 18:55:41 +0000 Subject: Plugins/DFInput: change the order of SDL subsystems being closed on SDL2 builds. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@93286 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- plugins/dfinput/pad.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'plugins/dfinput') diff --git a/plugins/dfinput/pad.c b/plugins/dfinput/pad.c index ba4ec0ab..bd3aef73 100755 --- a/plugins/dfinput/pad.c +++ b/plugins/dfinput/pad.c @@ -159,9 +159,10 @@ long PADclose(void) { DestroyKeyboard(); #if SDL_VERSION_ATLEAST(2,0,0) if (SDL_WasInit(SDL_INIT_EVERYTHING & ~(SDL_INIT_HAPTIC | SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER))) { - SDL_QuitSubSystem(SDL_INIT_HAPTIC); - SDL_QuitSubSystem(SDL_INIT_JOYSTICK); + if (has_haptic) + SDL_QuitSubSystem(SDL_INIT_HAPTIC); SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER); + SDL_QuitSubSystem(SDL_INIT_JOYSTICK); } else { #else if (SDL_WasInit(SDL_INIT_EVERYTHING & ~SDL_INIT_JOYSTICK)) { -- cgit v1.2.3