diff -r bf573002ff72 -r aba12c885d83 calendarui/controller/src/calenviewmanager.cpp --- a/calendarui/controller/src/calenviewmanager.cpp Mon Jun 21 15:38:59 2010 +0300 +++ b/calendarui/controller/src/calenviewmanager.cpp Thu Jul 15 18:37:27 2010 +0300 @@ -101,8 +101,11 @@ TRACE_ENTRY_POINT; delete iPopulator; - delete iToolbar; - + if(iToolbar) + { + delete iToolbar; + iToolbar = NULL; + } if( iSetting ) { iSetting->Release(); @@ -625,7 +628,8 @@ SetRepopulation(EFalse); // reactivate the current view - RequestActivationL(iCurrentViewId.iViewUid); + //RequestActivationL(iCurrentViewId.iViewUid); + RequestActivationL(KUidCalenDayView); // dim "today" toolbar item since focus is on today iToolbar->Toolbar().SetItemDimmed( ECalenGotoToday, ETrue, ETrue); @@ -1144,7 +1148,7 @@ if( iController.IsFasterAppFlagEnabled() ) { - iController.RemoveDeadCalendarsL(); + TRAP_IGNORE(iController.RemoveDeadCalendarsL()); } } break;