pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a corruption when you remove first joystick on Linux.

Browse source 
Fixes a bug where the joystick subsystem would get corrupted if you unplug the
first of multiple joysticks. Fixes bug 1714.


CR: saml
This commit is contained in:
Jørgen P. Tjernø 2013-02-12 11:47:29 -08:00
parent 7ecccf3fbd
commit 781ab3764f
5 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

0
Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj Normal file → Executable file
View file

BIN
Xcode/TemplatesForXcodeTiger/SDL Application/English.lproj/InfoPlist.strings
View file

Binary file not shown.

BIN
Xcode/TemplatesForXcodeTiger/SDL Cocoa Application/English.lproj/InfoPlist.strings
View file

Binary file not shown.

BIN
Xcode/TemplatesForXcodeTiger/SDL OpenGL Application/English.lproj/InfoPlist.strings
View file

Binary file not shown.

9
src/joystick/linux/SDL_sysjoystick.c
View file

@ -339,14 +339,13 @@ MaybeRemoveDevice(const char *path)
} }
if (prev != NULL) { if (prev != NULL) {
prev->next = item->next; prev->next = item->next;
} else {
SDL_assert(SDL_joylist == item);
SDL_joylist = item->next;
}
if (item == SDL_joylist_tail) { if (item == SDL_joylist_tail) {
SDL_joylist_tail = prev; SDL_joylist_tail = prev;
} }
} else {
SDL_assert(!SDL_joylist);
SDL_assert(!SDL_joylist_tail);
SDL_joylist = SDL_joylist_tail = NULL;
}
SDL_free(item->path); SDL_free(item->path);
SDL_free(item->name); SDL_free(item->name);
SDL_free(item); SDL_free(item);