From aac34aedcd7163850a4f12a5553ae109ff4b92f1 Mon Sep 17 00:00:00 2001 From: Joe Wreschnig Date: Wed, 27 Feb 2013 18:36:56 +0100 Subject: [PATCH] JSAction base property should be eweak as it creates a circular reference with base.children. --- Enjoy.xcodeproj/project.pbxproj | 4 ++-- JSAction.h | 9 +++------ SubAction.m | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Enjoy.xcodeproj/project.pbxproj b/Enjoy.xcodeproj/project.pbxproj index fc595d3..b8dc528 100644 --- 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 8e52e9c..b92c7d6 100644 --- a/JSAction.h +++ b/JSAction.h @@ -9,15 +9,12 @@ #import #import -@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 501d457..45ad4ea 100644 --- 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 -- 2.20.1