Changeset 3948

Timestamp:

Nov 23, 2007, 5:49:05 PM (15 years ago)

Author:

livings124

Message:

remove redundant code

File:

• trunk/macosx/Torrent.m (modified) (1 diff)

trunk/macosx/Torrent.m

@@ -882 +882 @@
     
     //add time when downloading
-    if (fStat->status == TR_STATUS_DOWNLOAD)
-    {
-        int eta = [self eta];
+    if (fStat->status == TR_STATUS_DOWNLOAD || ([self isSeeding] && fRatioSetting != NSOffState))
+    {
+        int eta = fStat->status == TR_STATUS_DOWNLOAD ? [self eta] : [self etaRatio];
         string = eta >= 0 ? [string stringByAppendingFormat: NSLocalizedString(@" - %@ remaining", "Torrent -> progress string"),
                                 [self etaString: eta]]
             : [string stringByAppendingString: NSLocalizedString(@" - remaining time unknown", "Torrent -> progress string")];
     }
-    else if ([self isSeeding] && fRatioSetting != NSOffState)
-    {
-        int eta = [self etaRatio];
-        string = eta >= 0 ? [string stringByAppendingFormat: NSLocalizedString(@" - %@ remaining", "Torrent -> progress string"),
-                                [self etaString: eta]]
-            : [string stringByAppendingString: NSLocalizedString(@" - remaining time unknown", "Torrent -> progress string")];
-    }
-    else;
     
     return string;