From 552fdad56d3656bb7313af769d41f524774a3308 Mon Sep 17 00:00:00 2001 From: endolf Date: Sun, 4 Dec 2005 22:14:35 +0000 Subject: [PATCH] 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. --- plugins/linux/src/native/jinput.cpp | 1 + 1 file changed, 1 insertion(+) 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;