fix incorrect eta value

diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c
index fe81671910a0396d91f036f25b870dc4ef62972e..f0c81564cd5189f02959d5125ba95fbf194fb51e 100644 (file)
--- a/libtransmission/torrent.c
+++ b/libtransmission/torrent.c
@@ -664,7 +664,7 @@ tr_torrentStat( tr_torrent * tor )
     else if( s->rateDownload < 0.1 )
         s->eta = TR_ETA_UNKNOWN;
     else
-        s->eta = s->leftUntilDone / (s->rateDownload / 1024.0);
+        s->eta = s->leftUntilDone / s->rateDownload / 1024.0;
 
     s->ratio = tr_getRatio( s->uploadedEver,
                             s->downloadedEver ? s->downloadedEver : s->haveValid );

diff --git a/macosx/NSStringAdditions.m b/macosx/NSStringAdditions.m
index f5bad692d13d79c4c1732794d33408353433dd2b..8e0d14a3b262745c29d1f34f941a730a1b260987 100644 (file)
--- a/macosx/NSStringAdditions.m
+++ b/macosx/NSStringAdditions.m
@@ -54,7 +54,7 @@
         convertedSize = size / 1048576.0;
         unit = NSLocalizedString(@"MB", "File size - megabytes");
     }
-    else if (size < 1099511627776)
+    else if (size < 1099511627776.0)
     {
         convertedSize = size / 1073741824.0;
         unit = NSLocalizedString(@"GB", "File size - gigabytes");