JSAction base property should be eweak as it creates a circular reference with base...

diff --git a/Enjoy.xcodeproj/project.pbxproj b/Enjoy.xcodeproj/project.pbxproj
index fc595d3e4bc30f1f4f1e0dd6014b1b3cfd127fed..b8dc528b2e2c9c05bf54b6ec5d02c7a11dfb0328 100644 (file)
--- a/Enjoy.xcodeproj/project.pbxproj
+++ b/Enjoy.xcodeproj/project.pbxproj
@@ -349,7 +349,7 @@
                                GCC_PREFIX_HEADER = Enjoy_Prefix.pch;
                                INFOPLIST_FILE = Info.plist;
                                INSTALL_PATH = "$(HOME)/Applications";
-                               MACOSX_DEPLOYMENT_TARGET = 10.6.8;
+                               MACOSX_DEPLOYMENT_TARGET = 10.7;
                                PRODUCT_NAME = Enjoy;
                        };
                        name = Debug;
@@ -371,7 +371,7 @@
                                GCC_PREFIX_HEADER = Enjoy_Prefix.pch;
                                INFOPLIST_FILE = Info.plist;
                                INSTALL_PATH = "$(HOME)/Applications";
-                               MACOSX_DEPLOYMENT_TARGET = 10.6.8;
+                               MACOSX_DEPLOYMENT_TARGET = 10.7;
                                PRODUCT_NAME = Enjoy;
                        };
                        name = Release;

diff --git a/JSAction.h b/JSAction.h
index 8e52e9c4594b6fc1849e652c8d786d0c3ed0e3df..b92c7d6301017b0ecd88b2335b388db8e8d3a132 100644 (file)
--- a/JSAction.h
+++ b/JSAction.h
@@ -9,15 +9,12 @@
 #import <Foundation/Foundation.h>
 #import <IOKit/hid/IOHIDBase.h>
 
-@interface JSAction : NSObject {
-       id base;
-       NSString *name;
-}
+@interface JSAction : NSObject
 
-@property (assign) void* cookie;
+@property (assign) void *cookie;
 @property (assign) int index;
 @property (copy) NSArray *children;
-@property (strong) id base;
+@property (weak) id base;
 @property (copy) NSString *name;
 @property (assign) BOOL active;
 @property (readonly) float magnitude;

diff --git a/SubAction.m b/SubAction.m
index 501d457b4c8fa2a238fcf1252881c4daaab3e154..45ad4ea63731379e5371c62d2d7ab6f1fb88ec70 100644 (file)
--- a/SubAction.m
+++ b/SubAction.m
@@ -21,7 +21,7 @@
 }
 
 -(NSString*) stringify {
-       return [[NSString alloc] initWithFormat: @"%@~%d", [base stringify], self.index];
+       return [[NSString alloc] initWithFormat: @"%@~%d", [self.base stringify], self.index];
 }
 
 @end