X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjoystick.cpp;h=208b58b2be51cb5ecbfca18f5206312c2455772e;hb=f7b2692b338aaf37470be0a1d0e5ae42c82e0c65;hp=14b5ff784a8f737cd49b67daee9c06c36d996595;hpb=04a4d0db6f20955f132491173c4ec8e11d1e5de1;p=virtualjaguar

diff --git a/src/joystick.cpp b/src/joystick.cpp
index 14b5ff7..208b58b 100644
--- a/src/joystick.cpp
+++ b/src/joystick.cpp
@@ -283,6 +283,8 @@ void JoystickExec(void)
 		joypad_0_buttons[BUTTON_D] = 0;
 #endif
 
+// This is handled by the GUI layer, as it should
+#if 0
 	// Joystick support [nwagenaar]
 
     if (vjs.useJoystick)
@@ -310,6 +312,7 @@ void JoystickExec(void)
 
 	// Needed to ensure that the events queue is empty [nwagenaar]
     SDL_PumpEvents();
+#endif
 }
 
 void JoystickReset(void)