always allow "resume selected right away" to be selected, even if there are no queues enabled
This commit is contained in:
parent
0ed6528ec7
commit
cd857d4bb8
|
@ -3404,9 +3404,6 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
|
|||
//enable resume selected waiting item
|
||||
if (action == @selector(resumeSelectedTorrentsNoWait:))
|
||||
{
|
||||
if (![fDefaults boolForKey: @"Queue"] && ![fDefaults boolForKey: @"QueueSeed"])
|
||||
return NO;
|
||||
|
||||
NSEnumerator * enumerator = [[fDisplayedTorrents objectsAtIndexes: [fTableView selectedRowIndexes]] objectEnumerator];
|
||||
Torrent * torrent;
|
||||
while ((torrent = [enumerator nextObject]))
|
||||
|
|
|
@ -487,15 +487,14 @@
|
|||
Torrent * torrent = [fTorrents objectAtIndex: row];
|
||||
|
||||
//pause/resume icon
|
||||
NSImage * pauseImage = nil;
|
||||
NSImage * pauseImage;
|
||||
NSRect pauseRect = [self pauseRectForRow: row];
|
||||
BOOL inPauseRect = fClickIn && NSPointInRect(fClickPoint, pauseRect);
|
||||
if ([torrent isActive])
|
||||
pauseImage = fClickIn && NSPointInRect(fClickPoint, pauseRect) ? [NSImage imageNamed: @"PauseOn.png"]
|
||||
: [NSImage imageNamed: @"PauseOff.png"];
|
||||
pauseImage = inPauseRect ? [NSImage imageNamed: @"PauseOn.png"] : [NSImage imageNamed: @"PauseOff.png"];
|
||||
else
|
||||
{
|
||||
BOOL inPauseRect = fClickIn && NSPointInRect(fClickPoint, pauseRect);
|
||||
if ([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask && [fDefaults boolForKey: @"Queue"])
|
||||
if ([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask)
|
||||
pauseImage = inPauseRect ? [NSImage imageNamed: @"ResumeNoWaitOn.png"] : [NSImage imageNamed: @"ResumeNoWaitOff.png"];
|
||||
else if ([torrent waitingToStart])
|
||||
pauseImage = inPauseRect ? [NSImage imageNamed: @"PauseOn.png"] : [NSImage imageNamed: @"PauseOff.png"];
|
||||
|
@ -503,7 +502,6 @@
|
|||
pauseImage = inPauseRect ? [NSImage imageNamed: @"ResumeOn.png"] : [NSImage imageNamed: @"ResumeOff.png"];
|
||||
}
|
||||
|
||||
if (pauseImage)
|
||||
[pauseImage compositeToPoint: NSMakePoint(pauseRect.origin.x, NSMaxY(pauseRect)) operation: NSCompositeSourceOver];
|
||||
|
||||
//reveal icon
|
||||
|
|
Loading…
Reference in New Issue