From 1db56619de2b18a29e08f324ae33c5982e32af5b Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Thu, 19 Dec 2019 18:03:28 -0800
Subject: [PATCH] Fixed rare infinite rumble in HIDAPI controller driver

---
 src/joystick/hidapi/SDL_hidapi_gamecube.c | 3 +++
 src/joystick/hidapi/SDL_hidapi_ps4.c      | 3 +++
 src/joystick/hidapi/SDL_hidapi_switch.c   | 5 ++++-
 src/joystick/hidapi/SDL_hidapi_xbox360.c  | 3 +++
 src/joystick/hidapi/SDL_hidapi_xbox360w.c | 3 +++
 src/joystick/hidapi/SDL_hidapi_xboxone.c  | 3 +++
 6 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/joystick/hidapi/SDL_hidapi_gamecube.c b/src/joystick/hidapi/SDL_hidapi_gamecube.c
index e4f997e00183e..6a88fe322289d 100644
--- a/src/joystick/hidapi/SDL_hidapi_gamecube.c
+++ b/src/joystick/hidapi/SDL_hidapi_gamecube.c
@@ -280,6 +280,9 @@ HIDAPI_DriverGameCube_RumbleJoystick(SDL_HIDAPI_Device *device, SDL_Joystick *jo
             }
             if (val && duration_ms) {
                 ctx->rumbleExpiration[i] = SDL_GetTicks() + SDL_min(duration_ms, SDL_MAX_RUMBLE_DURATION_MS);
+                if (!ctx->rumbleExpiration[i]) {
+                    ctx->rumbleExpiration[i] = 1;
+                }
             } else {
                 ctx->rumbleExpiration[i] = 0;
             }
diff --git a/src/joystick/hidapi/SDL_hidapi_ps4.c b/src/joystick/hidapi/SDL_hidapi_ps4.c
index 5a32ed8defb1b..7a1af84ee9802 100644
--- a/src/joystick/hidapi/SDL_hidapi_ps4.c
+++ b/src/joystick/hidapi/SDL_hidapi_ps4.c
@@ -312,6 +312,9 @@ HIDAPI_DriverPS4_RumbleJoystick(SDL_HIDAPI_Device *device, SDL_Joystick *joystic
 
     if ((low_frequency_rumble || high_frequency_rumble) && duration_ms) {
         ctx->rumble_expiration = SDL_GetTicks() + SDL_min(duration_ms, SDL_MAX_RUMBLE_DURATION_MS);
+        if (!ctx->rumble_expiration) {
+            ctx->rumble_expiration = 1;
+        }
     } else {
         ctx->rumble_expiration = 0;
     }
diff --git a/src/joystick/hidapi/SDL_hidapi_switch.c b/src/joystick/hidapi/SDL_hidapi_switch.c
index 81d0141cd81d0..f5a8f1d0fc405 100644
--- a/src/joystick/hidapi/SDL_hidapi_switch.c
+++ b/src/joystick/hidapi/SDL_hidapi_switch.c
@@ -760,7 +760,10 @@ HIDAPI_DriverSwitch_RumbleJoystick(SDL_HIDAPI_Device *device, SDL_Joystick *joys
     }
 
     if ((low_frequency_rumble || high_frequency_rumble) && duration_ms) {
-        ctx->m_nRumbleExpiration = SDL_GetTicks() + duration_ms;
+        ctx->m_nRumbleExpiration = SDL_GetTicks() + SDL_min(duration_ms, SDL_MAX_RUMBLE_DURATION_MS);
+        if (!ctx->m_nRumbleExpiration) {
+            ctx->m_nRumbleExpiration = 1;
+        }
     } else {
         ctx->m_nRumbleExpiration = 0;
     }
diff --git a/src/joystick/hidapi/SDL_hidapi_xbox360.c b/src/joystick/hidapi/SDL_hidapi_xbox360.c
index 0490392b6ad27..56c1e6f7f4108 100644
--- a/src/joystick/hidapi/SDL_hidapi_xbox360.c
+++ b/src/joystick/hidapi/SDL_hidapi_xbox360.c
@@ -400,6 +400,9 @@ HIDAPI_DriverXbox360_RumbleJoystick(SDL_HIDAPI_Device *device, SDL_Joystick *joy
 
     if ((low_frequency_rumble || high_frequency_rumble) && duration_ms) {
         ctx->rumble_expiration = SDL_GetTicks() + SDL_min(duration_ms, SDL_MAX_RUMBLE_DURATION_MS);
+        if (!ctx->rumble_expiration) {
+            ctx->rumble_expiration = 1;
+        }
     } else {
         ctx->rumble_expiration = 0;
     }
diff --git a/src/joystick/hidapi/SDL_hidapi_xbox360w.c b/src/joystick/hidapi/SDL_hidapi_xbox360w.c
index 118310f4f5532..562542033424c 100644
--- a/src/joystick/hidapi/SDL_hidapi_xbox360w.c
+++ b/src/joystick/hidapi/SDL_hidapi_xbox360w.c
@@ -149,6 +149,9 @@ HIDAPI_DriverXbox360W_RumbleJoystick(SDL_HIDAPI_Device *device, SDL_Joystick *jo
 
     if ((low_frequency_rumble || high_frequency_rumble) && duration_ms) {
         ctx->rumble_expiration = SDL_GetTicks() + SDL_min(duration_ms, SDL_MAX_RUMBLE_DURATION_MS);
+        if (!ctx->rumble_expiration) {
+            ctx->rumble_expiration = 1;
+        }
     } else {
         ctx->rumble_expiration = 0;
     }
diff --git a/src/joystick/hidapi/SDL_hidapi_xboxone.c b/src/joystick/hidapi/SDL_hidapi_xboxone.c
index 1ddd1a8f5ca85..9c03142fb74f7 100644
--- a/src/joystick/hidapi/SDL_hidapi_xboxone.c
+++ b/src/joystick/hidapi/SDL_hidapi_xboxone.c
@@ -312,6 +312,9 @@ HIDAPI_DriverXboxOne_RumbleJoystick(SDL_HIDAPI_Device *device, SDL_Joystick *joy
 
     if ((low_frequency_rumble || high_frequency_rumble) && duration_ms) {
         ctx->rumble_expiration = SDL_GetTicks() + SDL_min(duration_ms, SDL_MAX_RUMBLE_DURATION_MS);
+        if (!ctx->rumble_expiration) {
+            ctx->rumble_expiration = 1;
+        }
     } else {
         ctx->rumble_expiration = 0;
     }