mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove a redundant variable.

This commit is contained in:
Mitchell Livingston 2006-07-02 13:41:22 +00:00
parent 8b12341769
commit 35899d65d4
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
macosx/Controller.m
View File

@ -994,13 +994,13 @@ static void sleepCallBack(void * controller, io_service_t y,
if (![[fDefaults stringForKey: @"StartSetting"] isEqualToString: @"Wait"]) if (![[fDefaults stringForKey: @"StartSetting"] isEqualToString: @"Wait"])
return; return;
int desiredActive = [fDefaults integerForKey: @"WaitToStartNumber"], active = 0; int desiredActive = [fDefaults integerForKey: @"WaitToStartNumber"];
NSEnumerator * enumerator = [fTorrents objectEnumerator]; NSEnumerator * enumerator = [fTorrents objectEnumerator];
Torrent * torrent, * torrentToStart = nil; Torrent * torrent, * torrentToStart = nil;
while ((torrent = [enumerator nextObject])) while ((torrent = [enumerator nextObject]))
{ {
//ignore the torrent just stopped; for some reason it is not marked instantly as not active //ignore the torrent just stopped
if (torrent == finishedTorrent) if (torrent == finishedTorrent)
continue; continue;
@ -1008,8 +1008,8 @@ static void sleepCallBack(void * controller, io_service_t y,
{ {
if (![torrent isSeeding]) if (![torrent isSeeding])
{ {
active++; desiredActive--;
if (active >= desiredActive) if (desiredActive <= 0)
return; return;
} }
} }
@ -1026,7 +1026,10 @@ static void sleepCallBack(void * controller, io_service_t y,
if (torrentToStart) if (torrentToStart)
{ {
[torrentToStart startTransfer]; [torrentToStart startTransfer];
[self updateUI: nil]; [self updateUI: nil];
[self reloadInspector: nil];
[self updateTorrentHistory];
} }
} }
@ -1036,6 +1039,7 @@ static void sleepCallBack(void * controller, io_service_t y,
[self updateUI: nil]; [self updateUI: nil];
[self reloadInspector: nil]; [self reloadInspector: nil];
[self updateTorrentHistory];
} }
- (void) torrentStartSettingChange: (NSNotification *) notification - (void) torrentStartSettingChange: (NSNotification *) notification
@ -1047,12 +1051,12 @@ static void sleepCallBack(void * controller, io_service_t y,
[self updateTorrentHistory]; [self updateTorrentHistory];
} }
//will try to start, taking into consideration the start preference
- (void) attemptToStartAuto: (Torrent *) torrent - (void) attemptToStartAuto: (Torrent *) torrent
{ {
[self attemptToStartMultipleAuto: [NSArray arrayWithObject: torrent]]; [self attemptToStartMultipleAuto: [NSArray arrayWithObject: torrent]];
} }
//will try to start, taking into consideration the start preference
- (void) attemptToStartMultipleAuto: (NSArray *) torrents - (void) attemptToStartMultipleAuto: (NSArray *) torrents
{ {
NSString * startSetting = [fDefaults stringForKey: @"StartSetting"]; NSString * startSetting = [fDefaults stringForKey: @"StartSetting"];
@ -1090,7 +1094,7 @@ static void sleepCallBack(void * controller, io_service_t y,
NSSortDescriptor * orderDescriptor = [[[NSSortDescriptor alloc] initWithKey: NSSortDescriptor * orderDescriptor = [[[NSSortDescriptor alloc] initWithKey:
@"orderValue" ascending: YES] autorelease]; @"orderValue" ascending: YES] autorelease];
NSArray * descriptors = [[NSArray alloc] initWithObjects: orderDescriptor, nil]; NSArray * descriptors = [[NSArray alloc] initWithObjects: orderDescriptor, nil];
sortedTorrents = [torrents sortedArrayUsingDescriptors: descriptors]; sortedTorrents = [torrents sortedArrayUsingDescriptors: descriptors];
[descriptors release]; [descriptors release];
} }