Changeset 11211

Timestamp:

Sep 16, 2010, 2:00:54 AM (12 years ago)

Author:

Longinus00

Message:

(trunk) don't display "Got a list of 0 peers" for currently paused torrents

Location:

trunk

Files:

• daemon/remote.c (modified) (1 diff)
• gtk/details.c (modified) (2 diffs)
• qt/tracker-delegate.cc (modified) (2 diffs)

trunk/daemon/remote.c

@@ -1328 +1328 @@
             printf( "  Tracker %d: %s\n", (int)(id), host );
             if( isBackup )
-                printf( "  Backup on tier #%d\n", (int)tier );
+                printf( "  Backup on tier %d\n", (int)tier );
             else
-                printf( "  Active in tier #%d\n", (int)tier );
+                printf( "  Active in tier %d\n", (int)tier );
 
             if( !isBackup )
             {
-                if( hasAnnounced )
+                if( hasAnnounced && announceState != TR_TRACKER_INACTIVE )
                 {
                     tr_strltime( buf, now - lastAnnounceTime, sizeof( buf ) );

trunk/gtk/details.c

@@ -1822 +1822 @@
     if( !st->isBackup )
     {
-        if( st->hasAnnounced )
+        if( st->hasAnnounced && st->announceState != TR_TRACKER_INACTIVE )
         {
             g_string_append_c( gstr, '\n' );
@@ -1841 +1841 @@
         {
             case TR_TRACKER_INACTIVE:
-                if( !st->hasAnnounced ) {
-                    g_string_append_c( gstr, '\n' );
-                    g_string_append( gstr, _( "No updates scheduled" ) );
-                }
+                g_string_append_c( gstr, '\n' );
+                g_string_append( gstr, _( "No updates scheduled" ) );
                 break;
             case TR_TRACKER_WAITING:

trunk/qt/tracker-delegate.cc

@@ -153 +153 @@
     if( !inf.st.isBackup )
     {
-        if( inf.st.hasAnnounced )
+        if( inf.st.hasAnnounced && inf.st.announceState != TR_TRACKER_INACTIVE )
         {
             const QString tstr( timeToStringRounded( now - inf.st.lastAnnounceTime ) );
@@ -185 +185 @@
         {
             case TR_TRACKER_INACTIVE:
-                if( !inf.st.hasAnnounced ) {
-                    str += "<br/>\n";
-                    str += tr( "No updates scheduled" );
-                }
+                str += "<br/>\n";
+                str += tr( "No updates scheduled" );
                 break;