mirror of
https://github.com/transmission/transmission
synced 2025-03-09 13:50:00 +00:00
get rid of 2 global variables
This commit is contained in:
parent
7b42f87e50
commit
0fc517bd75
2 changed files with 6 additions and 14 deletions
|
@ -66,7 +66,7 @@ typedef enum
|
|||
|
||||
float fRatioLimit;
|
||||
int fRatioSetting;
|
||||
BOOL fFinishedSeeding, fWaitToStart, fError, fChecking, fStalled;
|
||||
BOOL fFinishedSeeding, fWaitToStart, fStalled;
|
||||
|
||||
int fOrderValue, fGroupValue;
|
||||
|
||||
|
|
|
@ -242,6 +242,9 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
|
|||
|
||||
- (void) update
|
||||
{
|
||||
//get previous status values before update
|
||||
BOOL wasChecking = [self isChecking], wasError = [self isError], wasStalled = fStalled;
|
||||
|
||||
fStat = tr_torrentStat(fHandle);
|
||||
|
||||
//check to stop for ratio
|
||||
|
@ -257,21 +260,12 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
|
|||
fFinishedSeeding = YES;
|
||||
}
|
||||
|
||||
//check if checking data
|
||||
BOOL wasChecking = fChecking;
|
||||
fChecking = fStat->status == TR_STATUS_CHECK || fStat->status == TR_STATUS_CHECK_WAIT;
|
||||
|
||||
//check for error
|
||||
BOOL wasError = fError;
|
||||
fError = [self isError];
|
||||
|
||||
//check if stalled
|
||||
BOOL wasStalled = fStalled;
|
||||
//check if stalled (stored because based on time and needs to check if it was previously stalled)
|
||||
fStalled = [self isActive] && [fDefaults boolForKey: @"CheckStalled"]
|
||||
&& [fDefaults integerForKey: @"StalledMinutes"] < [self stalledMinutes];
|
||||
|
||||
//update queue for checking (from downloading to seeding), stalled, or error
|
||||
if ((wasChecking && !fChecking) || (wasStalled != fStalled) || (!wasError && fError && [self isActive]))
|
||||
if ((wasChecking && ![self isChecking]) || (wasStalled != fStalled) || (!wasError && [self isError] && [self isActive]))
|
||||
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateQueue" object: self];
|
||||
}
|
||||
|
||||
|
@ -1562,8 +1556,6 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
|
|||
fOrderValue = orderValue ? [orderValue intValue] : tr_torrentCount(fLib) - 1;
|
||||
fGroupValue = groupValue ? [groupValue intValue] : -1;
|
||||
|
||||
fError = NO;
|
||||
|
||||
[self createFileList];
|
||||
|
||||
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(checkGroupValueForRemoval:)
|
||||
|
|
Loading…
Add table
Reference in a new issue