(trunk qt) #3095 "Don't show remaining time for paused torrents" -- fixed in trunk...

diff --git a/qt/torrent-delegate.cc b/qt/torrent-delegate.cc
index 0c323f1691f899c4d32d95c8d77f4486a89e76c1..08e6bbf221f89c41fd1208c247601760b2d39b6f 100644 (file)
--- a/qt/torrent-delegate.cc
+++ b/qt/torrent-delegate.cc
@@ -116,7 +116,7 @@ TorrentDelegate :: progressString( const Torrent& tor ) const
     }
 
     /* add time when downloading */
-    if( hasSeedRatio || tor.isDownloading( ) )
+    if( ( hasSeedRatio && tor.isSeeding( ) ) || tor.isDownloading( ) )
     {
         str += tr( " - " );
         if( tor.hasETA( ) )

diff --git a/qt/torrent.h b/qt/torrent.h
index c7874e8333bca0126adcae63609d74b4e50010bb..42c275c0540968f089a8a0d1fcf951c82fc99a38 100644 (file)
--- a/qt/torrent.h
+++ b/qt/torrent.h
@@ -275,6 +275,7 @@ class Torrent: public QObject
         bool isPaused( ) const { return getActivity( ) == TR_STATUS_STOPPED; }
         bool isVerifying( ) const { return getActivity( ) == TR_STATUS_CHECK; }
         bool isDownloading( ) const { return getActivity( ) == TR_STATUS_DOWNLOAD; }
+        bool isSeeding( ) const { return getActivity( ) == TR_STATUS_SEED; }
         bool isReadyToTransfer( ) const { return getActivity()==TR_STATUS_DOWNLOAD || getActivity()==TR_STATUS_SEED; }
         void notifyComplete( ) const;