From 0fe00d6450e7f0288cad751d46fff70118857859 Mon Sep 17 00:00:00 2001
From: "SND\\MaddTheSane_cp"
 <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Thu, 22 Aug 2013 23:57:03 +0000
Subject: 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
---
 plugins/dfinput/pad.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'plugins/dfinput')

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 {
-- 
cgit v1.2.3