Merge pull request julienXX#45 from russellhancox/master

Clearing some TODOs
mjabbour · Aug 24, 2013 · c8e2073 · c8e2073
2 parents 878042f + 3f745d4
commit c8e2073
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/Terminal Notifier/AppDelegate.m b/Terminal Notifier/AppDelegate.m
@@ -173,10 +173,9 @@ - (void)userActivatedNotification:(NSUserNotification *)userNotification;
   NSLog(@"     open: %@", open);
 
   BOOL success = YES;
-  // TODO this loses NO if a consecutive call does succeed
-  if (bundleID) success = [self activateAppWithBundleID:bundleID] && success;
-  if (command)  success = [self executeShellCommand:command] && success;
-  if (open)     success = [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:open]] && success;
+  if (bundleID) success &= [self activateAppWithBundleID:bundleID];
+  if (command)  success &= [self executeShellCommand:command];
+  if (open)     success &= [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:open]];
 
   exit(success ? 0 : 1);
 }
@@ -217,7 +216,6 @@ - (BOOL)executeShellCommand:(NSString *)command;
   return [task terminationStatus] == 0;
 }
 
-// TODO is this really needed?
 - (BOOL)userNotificationCenter:(NSUserNotificationCenter *)center
      shouldPresentNotification:(NSUserNotification *)userNotification;
 {