Changeset 484 for trunk/macosx/Controller.m

Timestamp:

Jun 26, 2006, 5:52:51 AM (16 years ago)

Author:

livings124

Message:

Added an option to only show the remove/quit warning if transfers are downloading (not seeding). Also change the word "torrent" to "transfer" in the prefs window.

File:

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

trunk/macosx/Controller.m

@@ -259 +259 @@
     if (!fUpdateInProgress && [fDefaults boolForKey: @"CheckQuit"])
     {
-        int active = 0;
+        int active = 0, downloading = 0;
         Torrent * torrent;
         NSEnumerator * enumerator = [fTorrents objectEnumerator];
         while ((torrent = [enumerator nextObject]))
             if ([torrent isActive])
+            {
                 active++;
-
-        if (active > 0)
+                if (![torrent isSeeding])
+                    downloading++;
+            }
+
+        BOOL shouldAsk = [fDefaults boolForKey: @"CheckRemoveDownloading"] ? downloading > 0 : active > 0;
+        if (shouldAsk)
         {
             NSString * message = active == 1
@@ -517 +522 @@
 {
     NSArray * torrents = [[self torrentsAtIndexes: indexSet] retain];
-    int active = 0;
-
-    Torrent * torrent;
-    NSEnumerator * enumerator = [torrents objectEnumerator];
-    while ((torrent = [enumerator nextObject]))
-        if ([torrent isActive])
-            active++;
-
-    if (active > 0 && [fDefaults boolForKey: @"CheckRemove"])
+    int active = 0, downloading = 0;
+
+    if ([fDefaults boolForKey: @"CheckRemove"])
+    {
+        Torrent * torrent;
+        NSEnumerator * enumerator = [torrents objectEnumerator];
+        while ((torrent = [enumerator nextObject]))
+            if ([torrent isActive])
+            {
+                active++;
+                if (![torrent isSeeding])
+                    downloading++;
+            }
+    }
+
+    BOOL shouldAsk = [fDefaults boolForKey: @"CheckRemoveDownloading"] ? downloading > 0 : active > 0;
+    if (shouldAsk)
     {
         NSDictionary * dict = [[NSDictionary alloc] initWithObjectsAndKeys: