prevent leak in storePreviouslyActiveApp

thekarladam · Sep 26, 2009 · eb4832e · eb4832e
1 parent 1d8f877
commit eb4832e
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/Visor.m b/src/Visor.m
@@ -520,10 +520,12 @@ - (id) init {
     LOG(@"Visor init");
 
     runningApplicationClass = NSClassFromString(@"NSRunningApplication"); // 10.6
-
-    NSString* path = [[NSBundle bundleForClass:[self class]] pathForResource:@"RestoreApp" ofType:@"scpt"];
-    restoreAppAppleScriptSource = [[NSString alloc] initWithContentsOfFile:path encoding:NSMacOSRomanStringEncoding error:NULL]; 
-    scriptError = [[NSDictionary alloc] init]; 
+    if (!runningApplicationClass) {
+        // 10.5 path
+        NSString* path = [[NSBundle bundleForClass:[self class]] pathForResource:@"RestoreApp" ofType:@"scpt"];
+        restoreAppAppleScriptSource = [[NSString alloc] initWithContentsOfFile:path encoding:NSMacOSRomanStringEncoding error:NULL]; 
+        scriptError = [[NSDictionary alloc] init]; 
+    }
 
     window = NULL;
 
@@ -848,7 +850,7 @@ - (void)storePreviouslyActiveApp {
         NSDictionary *activeAppDict = [[NSWorkspace sharedWorkspace] activeApplication];
         previouslyActiveAppPath = nil;
         if ([[activeAppDict objectForKey:@"NSApplicationBundleIdentifier"] compare:@"com.apple.Terminal"]) {
-            previouslyActiveAppPath = [[NSString alloc] initWithString:[activeAppDict objectForKey:@"NSApplicationPath"]];
+            previouslyActiveAppPath = [activeAppDict objectForKey:@"NSApplicationPath"];
         }
         LOG(@"  (10.5) -> %@", previouslyActiveAppPath);
     } else {