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] Proposed fix

joystick-fixes.patch (text/plain), 1.27 KB, created by (disabled) Jørgen Tjernø on 2013-02-08 11:12:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: (disabled) Jørgen Tjernø

Created: 2013-02-08 11:12:31 UTC

Size: 1.27 KB

patch

obsolete

># HG changeset patch
># User JÃ¸rgen P. TjernÃ¸ <jorgen@valvesoftware.com>
># Date 1360349773 28800
># Branch joystick
># Node ID 42b973ab143ed28e2993ce98df756edfaa641d43
># Parent  c259f0817583a33dee9da15f597b47fd8ca61b79
>Fix corruption when you remove first joystick on Linux.
>
>Fixes a bug where the joystick subsystem would get corrupted if you unplug the
>first of multiple joysticks. Fixes bug #1714.
>
>diff -r c259f0817583 -r 42b973ab143e src/joystick/linux/SDL_sysjoystick.c
>--- a/src/joystick/linux/SDL_sysjoystick.c	Tue Feb 05 12:10:54 2013 -0800
>+++ b/src/joystick/linux/SDL_sysjoystick.c	Fri Feb 08 10:56:13 2013 -0800
>@@ -334,13 +334,12 @@
>             }
>             if (prev != NULL) {
>                 prev->next = item->next;
>-                if (item == SDL_joylist_tail) {
>-                    SDL_joylist_tail = prev;
>-                }
>             } else {
>-                SDL_assert(!SDL_joylist);
>-                SDL_assert(!SDL_joylist_tail);
>-                SDL_joylist = SDL_joylist_tail = NULL;
>+                SDL_assert(SDL_joylist == item);
>+                SDL_joylist = item->next;
>+            }
>+            if (item == SDL_joylist_tail) {
>+                SDL_joylist_tail = prev;
>             }
>             SDL_free(item->path);
>             SDL_free(item->name);

Actions: View | Diff

Attachments on bug 1714: 1038

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.