From 68d355b4977bc77ec5a38be9974bc004e7d59241 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Sat, 4 Aug 2007 01:12:04 +0000 Subject: [PATCH] a little trivial cleanup --- macosx/InfoWindowController.m | 4 ++-- macosx/Torrent.m | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m index b187d4940..702f3e630 100644 --- a/macosx/InfoWindowController.m +++ b/macosx/InfoWindowController.m @@ -621,7 +621,7 @@ Torrent * torrent = [fTorrents objectAtIndex: 0]; NSIndexSet * indexSet = [fFileOutline selectedRowIndexes]; NSMutableIndexSet * itemIndexes = [NSMutableIndexSet indexSet]; - int i, index, state = (menuItem == fFileCheckItem) ? NSOnState : NSOffState; + int i, state = (menuItem == fFileCheckItem) ? NSOnState : NSOffState; for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i]) [itemIndexes addIndexes: [[fFileOutline itemAtRow: i] objectForKey: @"Indexes"]]; @@ -636,7 +636,7 @@ Torrent * torrent = [fTorrents objectAtIndex: 0]; NSIndexSet * indexSet = [fFileOutline selectedRowIndexes]; NSMutableIndexSet * itemIndexes = [NSMutableIndexSet indexSet]; - int i, index; + int i; for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i]) [itemIndexes addIndexes: [[fFileOutline itemAtRow: i] objectForKey: @"Indexes"]]; diff --git a/macosx/Torrent.m b/macosx/Torrent.m index 27d584bd1..481a47108 100644 --- a/macosx/Torrent.m +++ b/macosx/Torrent.m @@ -1297,7 +1297,7 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80 else offState = YES; - if (onState == offState) + if (onState && offState) return NSMixedState; } return onState ? NSOnState : NSOffState; @@ -1404,10 +1404,9 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80 NSDate * started = [NSDate dateWithTimeIntervalSince1970: start / 1000], * activity = [self dateActivity]; - if (!activity || [started compare: activity] == NSOrderedDescending) - return -1 * [started timeIntervalSinceNow] / 60; - else - return -1 * [activity timeIntervalSinceNow] / 60; + + NSDate * laterDate = !activity || [started compare: activity] == NSOrderedDescending ? started : activity; + return -1 * [laterDate timeIntervalSinceNow] / 60; } - (BOOL) isStalled