diff -r 8de11011eb1f -r 332c36fd0fd7 src/events/SDL_events.c
--- a/src/events/SDL_events.c	Thu Dec 13 22:26:30 2012 -0500
+++ b/src/events/SDL_events.c	Fri Dec 14 09:22:13 2012 -0800
@@ -70,9 +70,9 @@
 SDL_ShouldPollJoystick()
 {
 #if !SDL_JOYSTICK_DISABLED
-    if (SDL_PrivateJoystickNeedsPolling() &&
-        (!SDL_disabled_events[SDL_JOYAXISMOTION >> 8] ||
-         SDL_JoystickEventState(SDL_QUERY))) {
+    if ((!SDL_disabled_events[SDL_JOYAXISMOTION >> 8] ||
+         SDL_JoystickEventState(SDL_QUERY)) &&
+        SDL_PrivateJoystickNeedsPolling()) {
         return SDL_TRUE;
     }
 #endif