Changeset 10861 for trunk/macosx/Controller.m

Timestamp:

Jun 25, 2010, 10:19:28 PM (12 years ago)

Author:

livings124

Message:

#3320 When a download completes at the same time seeding completes, still show a Growl notification and play a sound

File:

• trunk/macosx/Controller.m (modified) (3 diffs)

trunk/macosx/Controller.m

@@ -1889 +1889 @@
     Torrent * torrent = [notification object];
     
-    if ([torrent isActive])
+    if ([[[notification userInfo] objectForKey: @"WasRunning"] boolValue])
     {
         if (!fSoundPlaying && [fDefaults boolForKey: @"PlayDownloadSound"])
@@ -1919 +1919 @@
             object: [torrent dataLocation]];
         
-        if ([fDefaults boolForKey: @"QueueSeed"] && [self numToStartFromQueue: NO] == 0)
+        if ([torrent isActive] && [fDefaults boolForKey: @"QueueSeed"] && [self numToStartFromQueue: NO] == 0)
         {
             [torrent stopTransfer];
@@ -1932 +1932 @@
 {
     Torrent * torrent = [notification object];
-    if ([torrent isActive])
-    {
-        if ([fDefaults boolForKey: @"Queue"] && [self numToStartFromQueue: YES] == 0)
-        {
-            [torrent stopTransfer];
-            [torrent setWaitToStart: YES];
-        }
+    if ([torrent isActive] && [fDefaults boolForKey: @"Queue"] && [self numToStartFromQueue: YES] == 0)
+    {
+        [torrent stopTransfer];
+        [torrent setWaitToStart: YES];
     }