summaryrefslogtreecommitdiffstats
path: root/plugins/linux/src
diff options
context:
space:
mode:
authorendolf <[email protected]>2005-12-04 22:14:35 +0000
committerendolf <[email protected]>2005-12-04 22:14:35 +0000
commit133e7f43a01e4c2423e68a0f3f1e946818bb2bda (patch)
tree0c2790a56e14df873316604c32e2f06a75bfb7ed /plugins/linux/src
parent183f7d09dd080c1663dadf388e6eb6ba31703253 (diff)
Fixed a sigsegv, once we've found a match for an event device and
joystick, don't look at that stick again, especially having nulled the pointer. git-svn-id: file:///home/sven/projects/JOGL/git-svn/svn-server-sync/jinput/trunk@133 e343933a-64c8-49c5-92b1-88f2ce3e89e8
Diffstat (limited to 'plugins/linux/src')
-rw-r--r--plugins/linux/src/native/jinput.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/linux/src/native/jinput.cpp b/plugins/linux/src/native/jinput.cpp
index 39eaf06..c6294a7 100644
--- a/plugins/linux/src/native/jinput.cpp
+++ b/plugins/linux/src/native/jinput.cpp
@@ -95,6 +95,7 @@ JNIEXPORT jint JNICALL Java_net_java_games_input_JInputLibrary_nativeInit
LOG_TRACE("Creating a mixed device with id %d, combining event device %d and joystick device %d\n", jinputNumDevices, i, j);
jinputDeviceList[jinputNumDevices] = new MixedDevice(jsDevice, eventDevice);
jsDevices[j] = NULL;
+ j++;
jinputNumDevices++;
joystickPtr = j;
j = numJoysticks;