retrieve peers and webseeds in a single loop

diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m
index 0f5df8400eff307bd071debf60912bccaf836a9c..ec226076175e3327c50bb8363b69ab417ef29da6 100644 (file)
--- a/macosx/InfoWindowController.m
+++ b/macosx/InfoWindowController.m
@@ -1265,6 +1265,7 @@ typedef enum
             fTrackers = nil;
             
             [fTrackerTable setTrackers: nil];
+            [fTrackerTable deselectAll: self];
             [fTrackerTable reloadData];
         }
         
@@ -1554,12 +1555,18 @@ typedef enum
     else
         [fPeers removeAllObjects];
     
+    if (!fWebSeeds)
+        fWebSeeds = [[NSMutableArray alloc] init];
+    else
+        [fWebSeeds removeAllObjects];
+    
     NSUInteger known = 0, connected = 0, tracker = 0, incoming = 0, cache = 0, pex = 0, dht = 0, ltep = 0,
                 toUs = 0, fromUs = 0;
     BOOL anyActive = false;
     for (Torrent * torrent in fTorrents)
     {
         [fPeers addObjectsFromArray: [torrent peers]];
+        [fWebSeeds addObjectsFromArray: [torrent webSeeds]];
         
         known += [torrent totalPeersKnown];
         
@@ -1583,6 +1590,12 @@ typedef enum
         }
     }
     
+    [fPeers sortUsingDescriptors: [self peerSortDescriptors]];
+    [fPeerTable reloadData];
+    
+    [fWebSeeds sortUsingDescriptors: [fWebSeedTable sortDescriptors]];
+    [fWebSeedTable reloadData];
+    
     NSString * knownString = [NSString stringWithFormat: NSLocalizedString(@"%d known", "Inspector -> Peers tab -> peers"), known];
     if (anyActive)
     {
@@ -1639,20 +1652,6 @@ typedef enum
         NSString * connectedText = [NSString stringWithFormat: @"%@\n%@", activeString, knownString];
         [fConnectedPeersField setStringValue: connectedText];
     }
-    
-    [fPeers sortUsingDescriptors: [self peerSortDescriptors]];
-    [fPeerTable reloadData];
-    
-    if (!fWebSeeds)
-        fWebSeeds = [[NSMutableArray alloc] init];
-    else
-        [fWebSeeds removeAllObjects];
-    
-    for (Torrent * torrent in fTorrents)
-        [fWebSeeds addObjectsFromArray: [torrent webSeeds]];
-    
-    [fWebSeeds sortUsingDescriptors: [fWebSeedTable sortDescriptors]];
-    [fWebSeedTable reloadData];
 }
 
 - (void) updateInfoFiles

diff --git a/macosx/MessageWindow.xib b/macosx/MessageWindow.xib
index c7e649beab3df832c0519e5fe97c1a7845ccff85..9a5d114f56da0d05ca8fc62b74d79cf4aa7ec92c 100644 (file)
--- a/macosx/MessageWindow.xib
+++ b/macosx/MessageWindow.xib
@@ -12,7 +12,7 @@
                </object>
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>
-                       <integer value="6"/>
+                       <integer value="72"/>
                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -715,7 +715,7 @@ AAAAAAAAAAAAAAAAAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwgMjAxMAA</bytes>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSSearchFieldCell" key="NSCell" id="788421673">
                                                                <int key="NSCellFlags">343014976</int>
-                                                               <int key="NSCellFlags2">268436544</int>
+                                                               <int key="NSCellFlags2">268436480</int>
                                                                <string key="NSContents"/>
                                                                <reference key="NSSupport" ref="42108294"/>
                                                                <string key="NSPlaceholderString">Filter</string>