X-Git-Url: https://git.yukkurigames.com/?a=blobdiff_plain;f=JoystickController.m;h=317e9a51c9b09ae0680c9cf42b9565ee9c8fd447;hb=3f6df7a954fb74bcebf6fc6c0e60821843b0f31b;hp=dfa246f6f622b909407153c735f00225d5bdd34a;hpb=51d43664909060e85c943c4d63cc3cff307ceb1d;p=enjoyable.git

diff --git a/JoystickController.m b/JoystickController.m
index dfa246f..317e9a5 100644
--- a/JoystickController.m
+++ b/JoystickController.m
@@ -60,7 +60,7 @@ static void input_callback(void *ctx, IOReturn inResult, void *inSender, IOHIDVa
     if (((ApplicationController *)[NSApplication sharedApplication].delegate).active) {
         JSAction *mainAction = [js actionForEvent:value];
         [mainAction notifyEvent:value];
-        NSArray *children = mainAction.children ? mainAction.children : @[mainAction];
+        NSArray *children = mainAction.children ? mainAction.children : mainAction ? @[mainAction] : @[];
         for (JSAction *subaction in children) {
             Target *target = [controller.currentConfig getTargetForAction:subaction];
             target.magnitude = mainAction.magnitude;
@@ -82,7 +82,7 @@ static void input_callback(void *ctx, IOReturn inResult, void *inSender, IOHIDVa
 }
 
 static int findAvailableIndex(NSArray *list, Joystick *js) {
-    for (int index = 0; ; index++) {
+    for (int index = 1; ; index++) {
         BOOL available = YES;
         for (Joystick *used in list) {
             if ([used.productName isEqualToString:js.productName] && used.index == index) {