Corrected device instance value for Linux joysticks.

libsdl-org · Dec 14, 2012 · 637ae9e · 637ae9e
1 parent b2bb1ec
commit 637ae9e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
@@ -722,7 +722,7 @@ SDL_SYS_JoystickOpen(SDL_Joystick * joystick, int device_index)
         return -1;
     }
 
-    joystick->instance_id = device_index;
+    joystick->instance_id = item->device_instance;
     joystick->hwdata = (struct joystick_hwdata *)
         SDL_malloc(sizeof(*joystick->hwdata));
     if (joystick->hwdata == NULL) {
@@ -732,7 +732,6 @@ SDL_SYS_JoystickOpen(SDL_Joystick * joystick, int device_index)
     }
     SDL_memset(joystick->hwdata, 0, sizeof(*joystick->hwdata));
     joystick->hwdata->removed = SDL_FALSE;
-    joystick->hwdata->device_instance = item->device_instance;
     joystick->hwdata->guid = item->guid;
     joystick->hwdata->fd = fd;
     joystick->hwdata->fname = SDL_strdup(item->path);

diff --git a/src/joystick/linux/SDL_sysjoystick_c.h b/src/joystick/linux/SDL_sysjoystick_c.h
@@ -25,7 +25,6 @@
 struct joystick_hwdata
 {
     int fd;
-    int device_instance;
     SDL_bool removed;
 
     SDL_JoystickGUID guid;