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

8118.patch (text/plain), 2.87 KB, created by David Brady on 2014-01-21 03:25:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Brady

Created: 2014-01-21 03:25:10 UTC

Size: 2.87 KB

patch

obsolete

># HG changeset patch
># User dbrady <dbrady@telltalegames.com>
># Date 1390274390 28800
>#      Mon Jan 20 19:19:50 2014 -0800
># Node ID 226038052647a285b337f74f5fa0290666be15aa
># Parent  988502081380d8249020370af5cbcfe348dd12b6
>Correctly detect controller loss
>
>diff -r 988502081380 -r 226038052647 src/joystick/android/SDL_sysjoystick.c
>--- a/src/joystick/android/SDL_sysjoystick.c	Mon Jan 20 20:25:43 2014 -0300
>+++ b/src/joystick/android/SDL_sysjoystick.c	Mon Jan 20 19:19:50 2014 -0800
>@@ -283,6 +283,10 @@
>         return -1;
>     }
> 
>+    if (item->hwdata) {
>+        item->hwdata->item = NULL;
>+    }
>+
>     const int retval = item->device_instance;
>     if (prev != NULL) {
>         prev->next = item->next;
>@@ -431,7 +435,16 @@
>     }
> 
>     joystick->instance_id = item->device_instance;
>-    joystick->hwdata = (struct joystick_hwdata *) item;
>+    joystick->hwdata = (struct joystick_hwdata *)
>+        SDL_malloc(sizeof(*joystick->hwdata));
>+    if (joystick->hwdata == NULL) {
>+        return SDL_OutOfMemory();
>+    }
>+    SDL_memset(joystick->hwdata, 0, sizeof(*joystick->hwdata));
>+    joystick->hwdata->item = item;
>+    SDL_assert(item->hwdata == NULL);
>+    item->hwdata = joystick->hwdata;
>+
>     item->joystick = joystick;
>     joystick->nhats = item->nhats;
>     joystick->nballs = item->nballs;
>@@ -444,7 +457,7 @@
> /* Function to determine is this joystick is attached to the system right now */
> SDL_bool SDL_SYS_JoystickAttached(SDL_Joystick *joystick)
> {
>-    return !joystick->closed && (joystick->hwdata != NULL);
>+    return !joystick->closed && (joystick->hwdata->item != NULL);
> }
> 
> void
>@@ -475,9 +488,11 @@
> SDL_SYS_JoystickClose(SDL_Joystick * joystick)
> {
>     if (joystick->hwdata) {
>-        ((SDL_joylist_item*)joystick->hwdata)->joystick = NULL;
>-        joystick->hwdata = NULL;
>-    }
>+		if (joystick->hwdata->item) {
>+			joystick->hwdata->item->hwdata = NULL;
>+		}
>+		joystick->hwdata = NULL;
>+	}
>     joystick->closed = 1;
> }
> 
>@@ -507,7 +522,7 @@
> 
> SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
> {
>-    return ((SDL_joylist_item*)joystick->hwdata)->guid;
>+    return ((SDL_joylist_item*)joystick->hwdata->item)->guid;
> }
> 
> #endif /* SDL_JOYSTICK_ANDROID */
>diff -r 988502081380 -r 226038052647 src/joystick/android/SDL_sysjoystick_c.h
>--- a/src/joystick/android/SDL_sysjoystick_c.h	Mon Jan 20 20:25:43 2014 -0300
>+++ b/src/joystick/android/SDL_sysjoystick_c.h	Mon Jan 20 19:19:50 2014 -0800
>@@ -40,11 +40,18 @@
>     SDL_bool is_accelerometer;
>     SDL_Joystick *joystick;
>     int nbuttons, naxes, nhats, nballs;
>+    struct joystick_hwdata *hwdata;
>     
>     struct SDL_joylist_item *next;
> } SDL_joylist_item;
> 
>-typedef SDL_joylist_item joystick_hwdata;
>+/* The private structure used to keep track of a joystick */
>+struct joystick_hwdata
>+{
>+    struct SDL_joylist_item *item;
>+};
>+
>+//typedef SDL_joylist_item joystick_hwdata;
> 
> #endif /* SDL_JOYSTICK_ANDROID */
>

Actions: View

Attachments on bug 2356: 1527 | 1528

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.