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
@@ -1145,4 +1145,5 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     Event* eventRSync;
     Event* eventLSync;
+    clearAllViews();
     QPtrList<Event>  eventRSyncSharp = remote->getExternLastSyncEvents();
     QPtrList<Event>  eventLSyncSharp = local->getExternLastSyncEvents();
@@ -1837,6 +1838,6 @@ bool CalendarView::openCalendar(QString filename, bool merge)
 
     globalFlagBlockAgenda = 1;
+    clearAllViews();
     if (!merge) {
-      mTodoList->clearList();
       mViewManager->setDocumentId( filename );
       mCalendar->close();
@@ -1949,5 +1950,6 @@ bool CalendarView::checkFileVersion(QString fn)
     syncCalendar( fn, 3 );
     Event * e = getLastSyncEvent();
-    mCalendar->deleteEvent ( e );
+    if ( e )
+        deleteEvent ( e );
     updateView();
     return true;
@@ -1982,4 +1984,5 @@ void CalendarView::closeCalendar()
  
     // child windows no longer valid
+    clearAllViews();
     emit closingDown();
 
@@ -2433,4 +2436,15 @@ 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()
 {
@@ -3944,4 +3958,5 @@ void CalendarView::takeOverCalendar()
     // TODO: Create Calendar::allIncidences() function and use it here
 
+    clearAllViews();
     QPtrList<Event> events = mCalendar->events();
     for(uint i=0; i<events.count(); ++i) {