Fixed 'Calendar Date Issue #2', posted by girishnair12345: "date cann…

…ot be nil..."
maximbilan · Jul 11, 2014 · 34563c3 · 34563c3
1 parent 1370f9e
commit 34563c3
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/ios_calendar/Sources/CalendarView.m b/ios_calendar/Sources/CalendarView.m
@@ -214,11 +214,13 @@ - (void)setMode:(NSInteger)m
 
 - (void)setCurrentDate:(NSDate *)currentDate
 {
-    NSCalendar *calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
-    NSDateComponents *components = [calendar components:(NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit) fromDate:currentDate];
-    currentDay = [components day];
-    currentMonth = [components month];
-    currentYear = [components year];
+    if (currentDate) {
+        NSCalendar *calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
+        NSDateComponents *components = [calendar components:(NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit) fromDate:currentDate];
+        currentDay = [components day];
+        currentMonth = [components month];
+        currentYear = [components year];
+    }
 }
 
 - (NSDate *)currentDate