1 files changed, 9 insertions, 4 deletions

diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 35774d6..2cd8792 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -205,10 +205,10 @@ void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen )
     //raiseCurrentView( full );
     mMainView->processIncidenceSelection( 0 );
-    mMainView->updateView();
-    raiseCurrentView( full );
+    //mMainView->updateView();
+    raiseCurrentView( full, true );
     mMainView->adaptNavigationUnits();
 }
 
-void KOViewManager::raiseCurrentView( bool fullScreen )
+void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView  )
 {
     mCurrentAgendaView = 0;
@@ -232,4 +232,7 @@ void KOViewManager::raiseCurrentView( bool fullScreen )
     }
     emit signalFullScreen( !fullScreen );
+    if ( callUpdateView )
+        mMainView->updateView();
+        
     if ( globalFlagBlockAgenda ==  5 ) {
         globalFlagBlockAgenda =  4;
@@ -273,5 +276,5 @@ void KOViewManager::updateView(const QDate &start, const QDate &end)
     if (mCurrentView) mCurrentView->showDates(start, end);
 
-    if (mTodoView) mTodoView->updateView();
+    if (mTodoView && mTodoView == mCurrentView ) mTodoView->updateView();
 }
 
@@ -521,5 +524,7 @@ void KOViewManager::showMonthView()
     //mFlagShowNextxDays = false;
     // if(mMonthView == mCurrentView) return;
+    mMainView->dateNavigator()->blockSignals( true );
     mMainView->dateNavigator()->selectMonth();
+    mMainView->dateNavigator()->blockSignals( false);
     // DateList tmpList = mMainView->dateNavigator()->selectedDates( );
     //mMonthView->showDates(tmpList.first(), tmpList.last());