[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[788] trunk/fuse/peripherals/joystick.c

[<fr...@us...>]

Revision: 788
          http://sourceforge.net/p/fuse-for-macosx/code/788
Author:   fredm
Date:     2015-06-03 13:29:56 +0000 (Wed, 03 Jun 2015)
Log Message:
-----------
Restore lost keyboard joystick binding function.

Modified Paths:
--------------
    trunk/fuse/peripherals/joystick.c

Modified: trunk/fuse/peripherals/joystick.c
===================================================================
--- trunk/fuse/peripherals/joystick.c	2015-03-02 10:40:58 UTC (rev 787)
+++ trunk/fuse/peripherals/joystick.c	2015-06-03 13:29:56 UTC (rev 788)
@@ -151,7 +151,10 @@
   case 1: type = settings_current.joystick_2_output; break;
 
   case JOYSTICK_KEYBOARD:
-    type = settings_current.joystick_keyboard_output; break;
+    type = settings_current.joy_keyboard ?
+                                    settings_current.joystick_keyboard_output :
+                                    JOYSTICK_TYPE_NONE;
+    break;
 
   default:
     return 0;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.