another attempt to fix a crasher, and more proof I don't really have …

…a handle on memory management
dustinrue · Sep 5, 2012 · fd93878 · fd93878
1 parent 88b29fc
commit fd93878
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/Source/ActiveApplicationEvidenceSource.h b/Source/ActiveApplicationEvidenceSource.h
@@ -10,7 +10,6 @@
 
 @interface ActiveApplicationEvidenceSource : GenericEvidenceSource {
     NSLock *lock;
-    NSMutableArray *applications;
 }
 
 @property (strong) NSString *activeApplication;

diff --git a/Source/ActiveApplicationEvidenceSource.m b/Source/ActiveApplicationEvidenceSource.m
@@ -19,24 +19,24 @@ - (id)init
 	if (!(self = [super init]))
 		return nil;
 
-	applications = [[NSMutableArray alloc] init];
     activeApplication = nil;
 
 	return self;
 }
 
 - (void)dealloc
 {
-	[applications release];
 
 	[super dealloc];
 }
 
 - (void)doFullUpdate:(NSNotification *) notification {
-    NSRunningApplication *runningApplication = [[notification userInfo] objectForKey:@"NSWorkspaceApplicationKey"];
-
-    activeApplication = [runningApplication bundleIdentifier];
 
+    [lock lock];
+    activeApplication = [[[notification userInfo] objectForKey:@"NSWorkspaceApplicationKey"] bundleIdentifier];
+    [lock unlock];
+
+    DSLog(@"activeApplication %@ (%@)", activeApplication, [activeApplication class]);
     // doFullUpdate is required, so just call it here
     [self doFullUpdate];
 }
@@ -76,7 +76,6 @@ - (void)stop
                                                                 object:nil];
 
 	[lock lock];
-	[applications removeAllObjects];
 	[self setDataCollected:NO];
 	[lock unlock];
 
@@ -90,24 +89,19 @@ - (NSString *)name
 
 - (BOOL)doesRuleMatch:(NSDictionary *)rule
 {
+    [lock lock];
 	NSString *param = [rule valueForKey:@"parameter"];
 	BOOL match = NO;
-
-    if ([activeApplication class] == [NSArray class]) {
-        DSLog(@"weird, activeApplication is an array?");
-        return false;
-    }
-    NSString *localActiveApplication = [activeApplication copy];
 
-
-
-
+    NSString *localActiveApplication = [activeApplication copy];
+
     if ([localActiveApplication isEqualToString:param]) {
         match = YES;
     }
 
     [localActiveApplication release];
 
+    [lock unlock];
 	return match;
 }
 
@@ -136,7 +130,7 @@ - (NSArray *)getSuggestions
 	}
 
 	[lock lock];
-	NSMutableArray *array = [NSMutableArray arrayWithCapacity:[applications count]];
+	NSMutableArray *array = [NSMutableArray arrayWithCapacity:[apps count]];
 
 	NSEnumerator *en = [apps objectEnumerator];
 	NSDictionary *dict;
@@ -159,4 +153,9 @@ - (NSString *) friendlyName {
     return NSLocalizedString(@"Active Application", @"");
 }
 
+- (void) goingToSleep:(id)arg {
+    if (running)
+        activeApplication = nil;
+}
+
 @end