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

Some changes for the last commit plus don't allow the same time for turning speed limit on and off.

This commit is contained in:
Mitchell Livingston 2006-08-12 20:36:17 +00:00
parent 3a1ee9dce0
commit 0947785d80
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
macosx/Controller.m
View File

@ -1260,12 +1260,10 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
if (![fDefaults boolForKey: @"SpeedLimitAuto"])
return;
//do nothing if time to turn on and off are equal
int onHour, offHour;
if ((onHour = [fDefaults integerForKey: @"SpeedLimitAutoOnHour"])
== (offHour = [fDefaults integerForKey: @"SpeedLimitAutoOffHour"]))
return;
int onHour = [fDefaults integerForKey: @"SpeedLimitAutoOnHour"],
offHour = [fDefaults integerForKey: @"SpeedLimitAutoOffHour"];
//check if should be on if within range
BOOL shouldBeOn;
int hour = [[NSCalendarDate calendarDate] hourOfDay];
if (onHour < offHour)
@ -1279,21 +1277,14 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
- (void) autoSpeedLimit: (NSTimer *) timer
{
BOOL autoOn, autoOff;
if (!(autoOn = [fDefaults boolForKey: @"SpeedLimitAutoOn"])
&& !(autoOff = [fDefaults boolForKey: @"SpeedLimitAutoOff"]))
if (![fDefaults boolForKey: @"SpeedLimitAuto"])
return;
//do nothing if time to turn on and off are equal
int onHour, offHour;
if ((onHour = [fDefaults integerForKey: @"SpeedLimitAutoOnHour"])
== (offHour = [fDefaults integerForKey: @"SpeedLimitAutoOffHour"]) && autoOn && autoOff)
return;
NSCalendarDate * currentDate = [NSCalendarDate calendarDate];
//toggle if within first few seconds of hour
NSCalendarDate * currentDate = [NSCalendarDate calendarDate];
if ([currentDate minuteOfHour] == 0 && [currentDate secondOfMinute] < AUTO_SPEED_LIMIT_SECONDS
&& [currentDate hourOfDay] == (fSpeedLimitEnabled ? offHour : onHour))
&& [currentDate hourOfDay] == (fSpeedLimitEnabled ? [fDefaults integerForKey: @"SpeedLimitAutoOffHour"]
: [fDefaults integerForKey: @"SpeedLimitAutoOnHour"]))
{
[self toggleSpeedLimit: nil];

3
macosx/PrefsController.m
View File

@ -512,7 +512,8 @@
NSString * key = (sender == fSpeedLimitAutoOnField) ? @"SpeedLimitAutoOnHour" : @"SpeedLimitAutoOffHour";
int hour = [sender intValue];
if (![[sender stringValue] isEqualToString: [NSString stringWithFormat: @"%d", hour]] || hour < 0 || hour > 23)
if (![[sender stringValue] isEqualToString: [NSString stringWithFormat: @"%d", hour]] || hour < 0 || hour > 23
|| [fSpeedLimitAutoOnField intValue] == [fSpeedLimitAutoOffField intValue])
{
NSBeep();
hour = [fDefaults integerForKey: key];