Merge pull request #19 from alexzielenski/dev

merge tag
alexzielenski · Feb 6, 2014 · 850926d · 850926d
2 parents f52c1c6 + 58dabb3
commit 850926d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/Mousecape/Mousecape/Mousecape-Info.plist b/Mousecape/Mousecape/Mousecape-Info.plist
@@ -36,11 +36,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0</string>
+	<string>0.0.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>965</string>
+	<string>967</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/Mousecape/Mousecape/src/controllers/MCLibraryController.m b/Mousecape/Mousecape/src/controllers/MCLibraryController.m
@@ -83,7 +83,7 @@ - (void)addCape:(MCCursorLibrary *)cape {
         NSLog(@"Not adding %@ to the library because an object with that identifier already exists", cape.identifier);
         return;
     }
-
+        
     if (!cape) {
         NSLog(@"Cannot add nil cape");
         return;

diff --git a/Mousecape/Mousecape/src/models/MCCursorLibrary.m b/Mousecape/Mousecape/src/models/MCCursorLibrary.m
@@ -254,6 +254,13 @@ - (NSSet *)cursorsWithIdentifier:(NSString *)identifier {
 }
 
 - (void)addCursor:(MCCursor *)cursor {
+    if ([self.cursors containsObject:cursor]) {
+        // Don't unnecessarily add a cursor/register observers with it because the
+        // observation info will leak when it gets dereferenced since we don't do it here
+        // since NSSet just silently skips items it already has
+        return;
+    }
+
     NSSet *change = [NSSet setWithObject:cursor];
 
     [[self.undoManager prepareWithInvocationTarget:self] removeCursor:cursor];
-Original file line number
+Diff line change
@@ Expand Up / @@ -83,7 +83,7 @@ - (void)addCape:(MCCursorLibrary *)cape { @@
             NSLog(@"Not adding %@ to the library because an object with that identifier already exists", cape.identifier);
             return;
         }
         if (!cape) {
             NSLog(@"Cannot add nil cape");
             return;
@@ Expand Down @@