projects
/
enjoyable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
aac34ae
)
Fix crash when no action is available.
author
Joe Wreschnig
<joe.wreschnig@gmail.com>
Wed, 27 Feb 2013 22:54:38 +0000
(23:54 +0100)
committer
Joe Wreschnig
<joe.wreschnig@gmail.com>
Wed, 27 Feb 2013 22:54:38 +0000
(23:54 +0100)
JoystickController.m
patch
|
blob
|
history
diff --git
a/JoystickController.m
b/JoystickController.m
index
dfa246f
..
8b350a4
100644
(file)
--- 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];
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;
for (JSAction *subaction in children) {
Target *target = [controller.currentConfig getTargetForAction:subaction];
target.magnitude = mainAction.magnitude;