diff -r ea672fcb0ea0 -r 360d55486d7f calendarui/controller/src/calenviewmanager.cpp --- a/calendarui/controller/src/calenviewmanager.cpp Thu May 27 12:51:15 2010 +0300 +++ b/calendarui/controller/src/calenviewmanager.cpp Fri Jun 11 13:37:54 2010 +0300 @@ -56,6 +56,7 @@ mCalenDayView = NULL; mCalenMonthView = NULL; mCalenDayViewAlt = NULL; + mSettingsView = NULL; // Connect to instance view and entry view creation signals from agenda // interface @@ -96,12 +97,22 @@ { TRACE_ENTRY_POINT; - delete mCalenMonthView; - delete mCalenDayView; - delete mSettingsView; - delete mDayViewDocLoader; - delete mDayViewAltDocLoader; - delete mMonthViewDocLoader; + if (mSettingsView) { + delete mSettingsView; + mSettingsView = 0; + } + if (mDayViewDocLoader) { + delete mDayViewDocLoader; + mDayViewDocLoader = 0; + } + if (mDayViewAltDocLoader) { + delete mDayViewAltDocLoader; + mDayViewAltDocLoader = 0; + } + if (mMonthViewDocLoader) { + delete mMonthViewDocLoader; + mMonthViewDocLoader = 0; + } TRACE_EXIT_POINT; } @@ -663,7 +674,9 @@ void CalenViewManager::handleInstanceViewCreation(int status) { Q_UNUSED(status); - mCalenMonthView->fetchEntriesAndUpdateModel(); + if (mCalenMonthView) { + mCalenMonthView->fetchEntriesAndUpdateModel(); + } } // ----------------------------------------------------------------------------