when getting the list of all trackers, exclude tiers when necessary

diff --git a/macosx/CreatorWindowController.m b/macosx/CreatorWindowController.m
index 125f90ab2d593ef6e767ab5cec5e8985126ac629..aa9d53274a35c770f58050c55f1b37fe375e5e04 100644 (file)
--- a/macosx/CreatorWindowController.m
+++ b/macosx/CreatorWindowController.m
@@ -194,7 +194,6 @@
         trackerString = [@"http://" stringByAppendingString: trackerString];
     
     //parse tracker string
-    #warning check if it works with https
     if (tr_httpParseURL([trackerString UTF8String], -1, NULL, NULL, NULL))
     {
         NSAlert * alert = [[[NSAlert alloc] init] autorelease];

diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index fcc467fc044031c6b90a7592a3ddbb4a7735cd0f..0ac308a5b809b710bd5273ec8cf89befbe6a7156 100644 (file)
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -770,15 +770,18 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
     return [NSString stringWithUTF8String: fStat->tracker_stat.scrapeResponse];
 }
 
+#warning removes separators?
 - (NSArray *) allTrackers: (BOOL) separators
 {
-    int count = fInfo->trackerCount;
-    NSMutableArray * allTrackers = [NSMutableArray arrayWithCapacity: count + fInfo->trackers[count-1].tier + 1];
+    int count = fInfo->trackerCount, capacity = count;
+    if (separators)
+        capacity += fInfo->trackers[count-1].tier + 1;
+    NSMutableArray * allTrackers = [NSMutableArray arrayWithCapacity: capacity];
     
     int i, tier = -1;
     for (i = 0; i < count; i++)
     {
-        if (tier != fInfo->trackers[i].tier)
+        if (separators && tier != fInfo->trackers[i].tier)
         {
             tier = fInfo->trackers[i].tier;
             [allTrackers addObject: [NSNumber numberWithInt: tier]];