We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Patch to disconnect all HIDAPI device joysticks

0001-Fix-shutting-down-HIDAPI-device-with-multiple-joysti.patch (text/plain), 1.84 KB, created by Zack Middleton (zturtleman) on 2019-12-22 20:49:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zack Middleton (zturtleman)

Created: 2019-12-22 20:49:45 UTC

Size: 1.84 KB

patch

obsolete

>From b1a39c3ece35673132f40620a828aa46bc50510f Mon Sep 17 00:00:00 2001
>From: Zack Middleton <zack@cloemail.com>
>Date: Sun, 22 Dec 2019 12:28:40 -0600
>Subject: [PATCH] Fix shutting down HIDAPI device with multiple joysticks
>
>Using Wii U GameCube USB adapter with multiple controllers attached and
>restarting SDL input in a game results in extra joysticks with NULL name.
>
>HIDAPI_CleanupDeviceDriver() shut down joysticks by iterating through
>device->num_joysticks but each HIDAPI_JoystickDisconnected() decreases
>device->num_joysticks and shifts joysticks array down. Resulting in only
>half of controllers being shutdown. It worked with only 1 controller
>attached though.
>
>Disconnect HIDAPI device joystick 0 until there are none left.
>---
> src/joystick/hidapi/SDL_hidapijoystick.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
>diff --git a/src/joystick/hidapi/SDL_hidapijoystick.c b/src/joystick/hidapi/SDL_hidapijoystick.c
>index e7f77644e..89a0e4c67 100644
>--- a/src/joystick/hidapi/SDL_hidapijoystick.c
>+++ b/src/joystick/hidapi/SDL_hidapijoystick.c
>@@ -484,20 +484,18 @@ HIDAPI_SetupDeviceDriver(SDL_HIDAPI_Device *device)
> static void
> HIDAPI_CleanupDeviceDriver(SDL_HIDAPI_Device *device)
> {
>-    int i;
>-
>     if (!device->driver) {
>         /* Already cleaned up */
>         return;
>     }
> 
>     /* Disconnect any joysticks */
>-    for (i = 0; i < device->num_joysticks; ++i) {
>-        SDL_Joystick *joystick = SDL_JoystickFromInstanceID(device->joysticks[i]);
>+    while (device->num_joysticks) {
>+        SDL_Joystick *joystick = SDL_JoystickFromInstanceID(device->joysticks[0]);
>         if (joystick) {
>             HIDAPI_JoystickClose(joystick);
>         }
>-        HIDAPI_JoystickDisconnected(device, device->joysticks[i]);
>+        HIDAPI_JoystickDisconnected(device, device->joysticks[0]);
>     }
> 
>     device->driver->FreeDevice(device);
>-- 
>2.11.0
>

Actions: View | Diff

Attachments on bug 4915: 4137

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.