Changeset 753 for trunk/macosx/Controller.m

Timestamp:

Aug 11, 2006, 11:18:56 PM (16 years ago)

Author:

livings124

Message:

Streamlined autoenable function a little.

File:

• trunk/macosx/Controller.m (modified) (1 diff)

trunk/macosx/Controller.m

@@ -1267 +1267 @@
         return;
     
-    BOOL rangeForOn = onHour < offHour;
-    int min, max;
-    if (rangeForOn)
-    {
-        min = onHour;
-        max = offHour;
-    }
+    BOOL shouldBeOn;
+    int hour = [[NSCalendarDate calendarDate] hourOfDay];
+    if (onHour < offHour)
+        shouldBeOn = hour >= onHour && hour < offHour;
     else
-    {
-        min = offHour;
-        max = onHour;
-    }
-    
-    int hour = [[NSCalendarDate calendarDate] hourOfDay];
-    BOOL inRange = hour >= min && hour < max;
-    
-    if ((!fSpeedLimitEnabled && (rangeForOn == inRange)) || (fSpeedLimitEnabled && (rangeForOn != inRange)))
+        shouldBeOn = hour < offHour || hour >= onHour;
+    
+    if ((!fSpeedLimitEnabled && shouldBeOn) || (fSpeedLimitEnabled && !shouldBeOn))
     {
         [self toggleSpeedLimit: nil];