Fix a bug where selected date won't be selected if OnDateSelected is …

…null
aaronweihe · Dec 13, 2013 · fef0ed5 · fef0ed5
1 parent b5cc1ce
commit fef0ed5
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/MonoDroid.TimesSquare/CalendarPickerView.cs b/MonoDroid.TimesSquare/CalendarPickerView.cs
@@ -96,12 +96,15 @@ private void OnCellClicked(MonthCellDescriptor cell)
                     OnInvalidDateSelected(this, new DateSelectedEventArgs(clickedDate));
                 }
             }
-            else if (OnDateSelected != null) {
-                if (DoSelectDate(clickedDate, cell)) {
-                    OnDateSelected(this, new DateSelectedEventArgs(clickedDate));
-                }
-                else {
-                    OnDateUnselected(this, new DateSelectedEventArgs(clickedDate));
+            else {
+                bool wasSelected = DoSelectDate(clickedDate, cell);
+                if (OnDateSelected != null) {
+                    if (wasSelected) {
+                        OnDateSelected(this, new DateSelectedEventArgs(clickedDate));
+                    }
+                    else if(OnDateUnselected != null) {
+                        OnDateUnselected(this, new DateSelectedEventArgs(clickedDate));
+                    }
                 }
             }
         }