X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=JoystickController.m;h=54734a8f7598165272f8351ef193520796a07118;hp=389532850b4925c419cb084fa13e3c975ddeff2f;hb=e68c19b5923618b763543c74bf8dd6f85d4d323e;hpb=fad073260e61084c4962e172c58a0595261bd811

diff --git a/JoystickController.m b/JoystickController.m
index 3895328..54734a8 100644
--- a/JoystickController.m
+++ b/JoystickController.m
@@ -5,7 +5,7 @@
 //  Created by Sam McCall on 4/05/09.
 //
 
-#import "CoreFoundation/CoreFoundation.h"
+#import "JoystickController.h"
 
 @implementation JoystickController
 
@@ -174,15 +174,12 @@ static void remove_callback(void *ctx, IOReturn inResult, void *inSender, IOHIDD
     CFRunLoopAddTimer(CFRunLoopGetCurrent(), timer, kCFRunLoopDefaultMode);
 }
 
--(id) determineSelectedAction {
-	id item = [outlineView itemAtRow: [outlineView selectedRow]];
-	if(!item)
-		return NULL;
-	if([item isKindOfClass: [JSAction class]] && [item subActions] != NULL)
-		return NULL;
-	if([item isKindOfClass: [Joystick class]])
-		return NULL;
-	return item;
+- (JSAction *)selectedAction {
+    id item = [outlineView itemAtRow:outlineView.selectedRow];
+	if ([item isKindOfClass: [JSAction class]] && ![item subActions])
+		return item;
+    else
+        return nil;
 }
 
 /* outline view */
@@ -227,9 +224,8 @@ static void remove_callback(void *ctx, IOReturn inResult, void *inSender, IOHIDD
 
 - (void)outlineViewSelectionDidChange: (NSNotification*) notification {
 	[targetController reset];
-	selectedAction = [self determineSelectedAction];
 	[targetController load];
-	if(programmaticallySelecting)
+	if (programmaticallySelecting)
 		[targetController focusKey];
 	programmaticallySelecting = NO;
 }