Changeset 3485 for trunk/macosx/Controller.m

Timestamp:

Oct 20, 2007, 9:27:46 PM (15 years ago)

Author:

livings124

Message:

eliminate the redundant isPaused, instead using !isActive

File:

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

trunk/macosx/Controller.m

@@ -2779 +2779 @@
         NSEnumerator * enumerator = [fTorrents objectEnumerator];
         while ((torrent = [enumerator nextObject]))
-            if ([torrent isPaused] && ![torrent waitingToStart])
+            if (![torrent isActive] && ![torrent waitingToStart])
                 return YES;
         return NO;
@@ -2801 +2801 @@
         Torrent * torrent;
         while ((torrent = [enumerator nextObject]))
-            if ([torrent isPaused] && ![torrent waitingToStart])
+            if (![torrent isActive] && ![torrent waitingToStart])
                 return YES;
         return NO;
@@ -2928 +2928 @@
         NSEnumerator * enumerator = [fTorrents objectEnumerator];
         while ((torrent = [enumerator nextObject]))
-            if ([torrent isPaused] && ![torrent waitingToStart])
+            if (![torrent isActive] && ![torrent waitingToStart])
                 return YES;
         return NO;
@@ -2942 +2942 @@
         NSEnumerator * enumerator = [fTorrents objectEnumerator];
         while ((torrent = [enumerator nextObject]))
-            if ([torrent isPaused] && [torrent waitingToStart])
+            if (![torrent isActive] && [torrent waitingToStart])
                 return YES;
         return NO;
@@ -2956 +2956 @@
         Torrent * torrent;
         while ((torrent = [enumerator nextObject]))
-            if ([torrent isPaused])
+            if (![torrent isActive])
                 return YES;
         return NO;
@@ -2984 +2984 @@
         Torrent * torrent;
         while ((torrent = [enumerator nextObject]))
-            if ([torrent isPaused] && ![torrent waitingToStart])
+            if (![torrent isActive] && ![torrent waitingToStart])
                 return YES;
         return NO;
@@ -3056 +3056 @@
             enumerator = [fTorrents objectEnumerator];
             while (!timeUp && (torrent = [enumerator nextObject]))
-                while (![torrent isPaused] && !(timeUp = [start timeIntervalSinceNow] < -5.0))
+                while ([torrent isActive] && !(timeUp = [start timeIntervalSinceNow] < -5.0))
                 {
                     usleep(100000);