summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-08-22 23:57:03 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-08-22 23:57:03 +0000
commit0fe00d6450e7f0288cad751d46fff70118857859 (patch)
treeeb9260b7b5bc9ad3d12ef2a0a70822561788dd2d /plugins
parent531ad373b2c22e00a341a6635023cf8949571bd5 (diff)
Some better checking for disabling haptic feedback on the dfinput plug-in.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@86850 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'plugins')
-rwxr-xr-xplugins/dfinput/pad.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/plugins/dfinput/pad.c b/plugins/dfinput/pad.c
index d56c14ae..9404f574 100755
--- a/plugins/dfinput/pad.c
+++ b/plugins/dfinput/pad.c
@@ -134,7 +134,12 @@ long PADclose(void) {
DestroySDLJoy();
DestroyKeyboard();
-
+#if SDL_VERSION_ATLEAST(1,3,0)
+ if (SDL_WasInit(SDL_INIT_EVERYTHING & ~(SDL_INIT_HAPTIC | SDL_INIT_JOYSTICK))) {
+ SDL_QuitSubSystem(SDL_INIT_HAPTIC);
+ SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
+ } else
+#endif
if (SDL_WasInit(SDL_INIT_EVERYTHING & ~SDL_INIT_JOYSTICK)) {
SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
} else {