Changeset 6233

Timestamp:

Jun 19, 2008, 8:53:08 PM (15 years ago)

Author:

livings124

Message:

when setting up the speed limit timer, create the fire date using the user's default calendar

File:

• trunk/macosx/Controller.m (modified) (4 diffs)

trunk/macosx/Controller.m

@@ -2346 +2346 @@
         return;
     
-    NSCalendar * calendar = [[NSCalendar alloc] initWithCalendarIdentifier: NSGregorianCalendar];
+    NSCalendar * calendar = [NSCalendar currentCalendar];
     NSDateComponents * nowComponents = [calendar components: NSHourCalendarUnit | NSMinuteCalendarUnit fromDate: [NSDate date]],
                     * onComponents = [calendar components: NSHourCalendarUnit | NSMinuteCalendarUnit
@@ -2352 +2352 @@
                     * offComponents = [calendar components: NSHourCalendarUnit | NSMinuteCalendarUnit
                                         fromDate: [fDefaults objectForKey: @"SpeedLimitAutoOffDate"]];
-    [calendar release];
     
     //check if should be on if within range
@@ -2400 +2399 @@
     
     //create date with combination of the current date and the date to go off
-    NSCalendar * calendar = [[NSCalendar alloc] initWithCalendarIdentifier: NSGregorianCalendar];
+    NSCalendar * calendar = [NSCalendar currentCalendar];
     NSDateComponents * nowComponents = [calendar components: NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit
                                         | NSHourCalendarUnit | NSMinuteCalendarUnit fromDate: [NSDate date]],
@@ -2416 +2415 @@
     
     NSDate * dateToUse = [calendar dateFromComponents: nowComponents];
-    [calendar release];
     
     fSpeedLimitTimer = [[NSTimer alloc] initWithFireDate: dateToUse interval: 0 target: self selector: @selector(autoSpeedLimit:)