geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add new virtual joysticks to the end of the list 

This guarantees that the device index that's returned is stable, as long as no joystick hotplug events occur.
main
Sam Lantinga 2022-05-16 09:02:35 -07:00
parent 3c3ccb1d48
commit 1f2a241688
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/joystick/virtual/SDL_virtualjoystick.c
View File

@ -245,8 +245,16 @@ SDL_JoystickAttachVirtualInner(const SDL_VirtualJoystickDesc *desc)
hwdata->instance_id = SDL_GetNextJoystickInstanceID(); hwdata->instance_id = SDL_GetNextJoystickInstanceID();
/* Add virtual joystick to SDL-global lists */ /* Add virtual joystick to SDL-global lists */
hwdata->next = g_VJoys; if (g_VJoys) {
joystick_hwdata *last;
for (last = g_VJoys; last->next; last = last->next) {
continue;
}
last->next = hwdata;
} else {
g_VJoys = hwdata; g_VJoys = hwdata;
}
SDL_PrivateJoystickAdded(hwdata->instance_id); SDL_PrivateJoystickAdded(hwdata->instance_id);
/* Return the new virtual-device's index */ /* Return the new virtual-device's index */

2
test/testgamecontroller.c
View File

@ -365,7 +365,7 @@ static void CloseVirtualController()
{ {
int i; int i;
for (i = 0; i < SDL_NumJoysticks(); ++i) { for (i = SDL_NumJoysticks(); i--; ) {
if (SDL_JoystickIsVirtual(i)) { if (SDL_JoystickIsVirtual(i)) {
SDL_JoystickDetachVirtual(i); SDL_JoystickDetachVirtual(i);
} }