| -rw-r--r-- | korganizer/calendarview.cpp | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 608b73b..e13d0be 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -1146,2 +1146,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int Event* eventLSync; + clearAllViews(); QPtrList<Event> eventRSyncSharp = remote->getExternLastSyncEvents(); @@ -1838,4 +1839,4 @@ bool CalendarView::openCalendar(QString filename, bool merge) globalFlagBlockAgenda = 1; + clearAllViews(); if (!merge) { - mTodoList->clearList(); mViewManager->setDocumentId( filename ); @@ -1950,3 +1951,4 @@ bool CalendarView::checkFileVersion(QString fn) Event * e = getLastSyncEvent(); - mCalendar->deleteEvent ( e ); + if ( e ) + deleteEvent ( e ); updateView(); @@ -1983,2 +1985,3 @@ void CalendarView::closeCalendar() // child windows no longer valid + clearAllViews(); emit closingDown(); @@ -2434,2 +2437,13 @@ void CalendarView::updateView(const QDate &start, const QDate &end) +void CalendarView::clearAllViews() +{ + mTodoList->clearList(); + mViewManager->clearAllViews(); + SearchDialog * sd = mDialogManager->getSearchDialog(); + if ( sd ) { + KOListView* kol = sd->listview(); + if ( kol ) + kol->clearList(); + } +} void CalendarView::updateView() @@ -3945,2 +3959,3 @@ void CalendarView::takeOverCalendar() + clearAllViews(); QPtrList<Event> events = mCalendar->events(); |