From 0c99323db3e5404301c249512b736d426bd41d09 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 5 Mar 2014 13:42:38 -0500
Subject: [PATCH] Fix possible exception when retrieving reminder

Fixes #2624
---
 NEWS                              | 1 +
 UI/PreferencesUI/UIxPreferences.m | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 2edfe9509..a68d360fc 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ Bug fixes
  - fixed unsubscription when renaming an IMAP folder (#2630)
  - fixed sorting of events list by calendar name (#2629)
  - fixed wrong date format leading to Android email syncing issues (#2609)
+ - fixed possible exception when retrieving the default event reminder value (#2624)
 
 2.2.0 (2014-02-24)
 ------------------
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 63798b11d..7ba612cac 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -571,10 +571,13 @@ static NSArray *reminderValues = nil;
   int index;
 
   value = [userDefaults calendarDefaultReminder];
-  index = [reminderValues indexOfObject: value];
+  if (value != nil)
+    {
+      index = [reminderValues indexOfObject: value];
 
-  if (index != NSNotFound)
-    return [reminderItems objectAtIndex: index];
+      if (index != NSNotFound)
+        return [reminderItems objectAtIndex: index];
+    }
  
   return @"NONE";
 }