From e6d81110d9545bddf223a33a2a4a154d55acccaa Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Fri, 11 Aug 2006 23:18:56 +0000 Subject: [PATCH] Streamlined autoenable function a little. --- macosx/Controller.m | 21 +++++------------- macosx/English.lproj/PrefsWindow.nib/info.nib | 2 +- .../PrefsWindow.nib/keyedobjects.nib | Bin 36089 -> 36088 bytes 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/macosx/Controller.m b/macosx/Controller.m index d4aae39d2..f66531405 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -1266,23 +1266,14 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy == (offHour = [fDefaults integerForKey: @"SpeedLimitAutoOffHour"])) return; - BOOL rangeForOn = onHour < offHour; - int min, max; - if (rangeForOn) - { - min = onHour; - max = offHour; - } - else - { - min = offHour; - max = onHour; - } - + BOOL shouldBeOn; int hour = [[NSCalendarDate calendarDate] hourOfDay]; - BOOL inRange = hour >= min && hour < max; + if (onHour < offHour) + shouldBeOn = hour >= onHour && hour < offHour; + else + shouldBeOn = hour < offHour || hour >= onHour; - if ((!fSpeedLimitEnabled && (rangeForOn == inRange)) || (fSpeedLimitEnabled && (rangeForOn != inRange))) + if ((!fSpeedLimitEnabled && shouldBeOn) || (fSpeedLimitEnabled && !shouldBeOn)) { [self toggleSpeedLimit: nil]; diff --git a/macosx/English.lproj/PrefsWindow.nib/info.nib b/macosx/English.lproj/PrefsWindow.nib/info.nib index 5be50fb3e..d9068cacb 100644 --- a/macosx/English.lproj/PrefsWindow.nib/info.nib +++ b/macosx/English.lproj/PrefsWindow.nib/info.nib @@ -7,7 +7,7 @@ IBEditorPositions 153 - 119 348 584 311 0 0 1152 842 + 285 423 582 311 0 0 1152 842 28 58 372 582 290 0 0 1152 842 41 diff --git a/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib b/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib index 05006ac2efa91962d696caf6f85a81739f6092a3..aa982d3be3add17fcf67b6a66a7de10da15343a2 100644 GIT binary patch delta 5896 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 delta 5841 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