From 73565b2bc41936073147351640909b52cd54a917 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Tue, 9 Jan 2007 15:06:45 +0000 Subject: [PATCH] a little better menu item validation --- macosx/Controller.m | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/macosx/Controller.m b/macosx/Controller.m index c43d54f1e..9d6f0750e 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -2361,7 +2361,7 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy Torrent * torrent; NSEnumerator * enumerator = [fTorrents objectEnumerator]; while ((torrent = [enumerator nextObject])) - if (![torrent isActive] && [torrent waitingToStart]) + if ([torrent isPaused] && [torrent waitingToStart]) return YES; return NO; } @@ -2375,10 +2375,8 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy NSEnumerator * enumerator = [[fDisplayedTorrents objectsAtIndexes: [fTableView selectedRowIndexes]] objectEnumerator]; Torrent * torrent; while ((torrent = [enumerator nextObject])) - { - if (![torrent isActive]) + if ([torrent isPaused]) return YES; - } return NO; } @@ -2391,10 +2389,8 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy NSEnumerator * enumerator = [[fDisplayedTorrents objectsAtIndexes: [fTableView selectedRowIndexes]] objectEnumerator]; Torrent * torrent; while ((torrent = [enumerator nextObject])) - { if ([torrent isActive] || [torrent waitingToStart]) return YES; - } return NO; } @@ -2404,16 +2400,11 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy if (!canUseTable) return NO; + NSEnumerator * enumerator = [[fDisplayedTorrents objectsAtIndexes: [fTableView selectedRowIndexes]] objectEnumerator]; Torrent * torrent; - NSIndexSet * indexSet = [fTableView selectedRowIndexes]; - unsigned int i; - - for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i]) - { - torrent = [fDisplayedTorrents objectAtIndex: i]; + while ((torrent = [enumerator nextObject])) if ([torrent isPaused] && ![torrent waitingToStart]) return YES; - } return NO; }