joystick: Remove force_centering flag; we handle this on disconnect now.
diff --git a/src/joystick/SDL_gamecontroller.c b/src/joystick/SDL_gamecontroller.c
index 9d92aa5..1468c42 100644
--- a/src/joystick/SDL_gamecontroller.c
+++ b/src/joystick/SDL_gamecontroller.c
@@ -2139,7 +2139,7 @@
return (0);
}
} else {
- if (!SDL_TICKS_PASSED(now, gamecontroller->guide_button_down+SDL_MINIMUM_GUIDE_BUTTON_DELAY_MS) && !gamecontroller->joystick->force_recentering) {
+ if (!SDL_TICKS_PASSED(now, gamecontroller->guide_button_down+SDL_MINIMUM_GUIDE_BUTTON_DELAY_MS)) {
gamecontroller->joystick->delayed_guide_button = SDL_TRUE;
return (0);
}
diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c
index bc6c720..3ec854e 100644
--- a/src/joystick/SDL_joystick.c
+++ b/src/joystick/SDL_joystick.c
@@ -1371,12 +1371,6 @@
}
SDL_UnlockJoysticks();
}
-
- /* !!! FIXME: only one thing sets force_recentering now (the Darwin code), see if that can be removed. */
- if (joystick->force_recentering) {
- SDL_PrivateJoystickForceRecentering(joystick);
- joystick->force_recentering = SDL_FALSE;
- }
}
SDL_LockJoysticks();
diff --git a/src/joystick/SDL_sysjoystick.h b/src/joystick/SDL_sysjoystick.h
index 5aa7577..9cb85cd 100644
--- a/src/joystick/SDL_sysjoystick.h
+++ b/src/joystick/SDL_sysjoystick.h
@@ -67,7 +67,6 @@
SDL_bool attached;
SDL_bool is_game_controller;
SDL_bool delayed_guide_button; /* SDL_TRUE if this device has the guide button event delayed */
- SDL_bool force_recentering; /* SDL_TRUE if this device needs to have its state reset to 0 */
SDL_JoystickPowerLevel epowerlevel; /* power level of this joystick, SDL_JOYSTICK_POWER_UNKNOWN if not supported */
struct _SDL_JoystickDriver *driver;
diff --git a/src/joystick/darwin/SDL_sysjoystick.c b/src/joystick/darwin/SDL_sysjoystick.c
index 86debc3..fbee787 100644
--- a/src/joystick/darwin/SDL_sysjoystick.c
+++ b/src/joystick/darwin/SDL_sysjoystick.c
@@ -936,7 +936,6 @@
if (device->removed) { /* device was unplugged; ignore it. */
if (joystick->hwdata) {
- joystick->force_recentering = SDL_TRUE;
joystick->hwdata = NULL;
}
return;
