From 6d8a2f51c5bdedcc3237bdafb35255581ebe0e95 Mon Sep 17 00:00:00 2001
From: Thomas <thomas@brotherli.ch>
Date: Thu, 28 Jul 2011 10:17:42 +0200
Subject: [PATCH] Fix calendar selection for new events in case default
 calendar is not writeable (#225)

---
 plugins/calendar/calendar_ui.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 99596346..f29ea27d 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -1538,12 +1538,17 @@ function rcube_calendar_ui(settings)
         .data('id', id);
       }
       
-      if (!cal.readonly && !this.selected_calendar && (!settings.default_calendar || settings.default_calendar == id)) {
+      if (!cal.readonly && !this.selected_calendar) {
         this.selected_calendar = id;
         rcmail.enable_command('addevent', true);
       }
     }
-
+    
+    // select default calendar
+    if (settings.default_calendar && this.calendars[settings.default_calendar] && !this.calendars[settings.default_calendar].readonly)
+      this.selected_calendar = settings.default_calendar;
+    
+    
     // initalize the fullCalendar plugin
     var fc = $('#calendar').fullCalendar({
       header: {