Fix a 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. CR: saml
libsdl-org · Feb 12, 2013 · bb4a38c · bb4a38c
1 parent 0e68e38
commit bb4a38c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj b/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj
diff --git a/Xcode/TemplatesForXcodeTiger/SDL Application/English.lproj/InfoPlist.strings b/Xcode/TemplatesForXcodeTiger/SDL Application/English.lproj/InfoPlist.strings
diff --git a/Xcode/TemplatesForXcodeTiger/SDL Cocoa Application/English.lproj/InfoPlist.strings b/Xcode/TemplatesForXcodeTiger/SDL Cocoa Application/English.lproj/InfoPlist.strings
diff --git a/Xcode/TemplatesForXcodeTiger/SDL OpenGL Application/English.lproj/InfoPlist.strings b/Xcode/TemplatesForXcodeTiger/SDL OpenGL Application/English.lproj/InfoPlist.strings
diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
@@ -339,13 +339,12 @@ MaybeRemoveDevice(const char *path)
             }
             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);