Changeset 5453

Timestamp:

Mar 30, 2008, 4:42:06 AM (14 years ago)

Author:

livings124

Message:

(1.1x) Fix visual glitch with the tracker inspector tab when there is no scrape address

Location:

branches/1.1x

Files:

• NEWS (modified) (1 diff)
• macosx/InfoWindowController.m (modified) (1 diff)
• macosx/Torrent.m (modified) (1 diff)

branches/1.1x/NEWS

@@ -1 +1 @@
 NEWS file for Transmission <http://www.transmissionbt.com/>
+
+1.11 (2008/xx/yy)
+- Mac
+   + Fix visual glitch with the tracker inspector tab when there is no scrape address
 
 1.10 (2008/03/28)

branches/1.1x/macosx/InfoWindowController.m

@@ -1135 +1135 @@
     
     //scrape fields
-    NSString * scrapeAddress = [[torrent trackerAddress] stringByAppendingString: [torrent trackerAddressScrape]];
-    [fScrapeAddressField setStringValue: scrapeAddress];
-    [fScrapeAddressField setToolTip: scrapeAddress];
+    NSString * scrapeAddressTail;
+    if ((scrapeAddressTail = [torrent trackerAddressScrape]))
+    {
+        NSString * scrapeAddress = [[torrent trackerAddress] stringByAppendingString: scrapeAddressTail];
+        [fScrapeAddressField setStringValue: scrapeAddress];
+        [fScrapeAddressField setToolTip: scrapeAddress];
+    }
+    else
+    {
+        [fScrapeAddressField setStringValue: @""];
+        [fScrapeAddressField setToolTip: @""];
+    }
     
     [fScrapeLastField setObjectValue: [torrent lastScrapeTime]];

branches/1.1x/macosx/Torrent.m

@@ -740 +740 @@
 - (NSString *) trackerAddressScrape
 {
-    return [NSString stringWithUTF8String: fStat->tracker->scrape];
+    return fStat->tracker->scrape ? [NSString stringWithUTF8String: fStat->tracker->scrape] : nil;
 }