1 files changed, 22 insertions, 0 deletions

diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 3483e95..5e8ea27 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -596,24 +596,29 @@ void KOTodoView::updateView()
     if ( !isVisible() ) {
        mPendingUpdateBeforeRepaint = true;
        return;
     }
     //qDebug("KOTodoView::updateView() %x", this);
     if ( isFlatDisplay ) {
         displayAllFlat();
         return;
     }
     //qDebug("update ");
 //  kdDebug() << "KOTodoView::updateView()" << endl;
     QFont fo = KOPrefs::instance()->mTodoViewFont;
+    Incidence* oldInc = 0;
+    mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem();
+    if (mActiveItem)
+        oldInc = mActiveItem->todo();
+
     mTodoListView->clear();
     if ( mName == "todolistsmall" ) {
         if ( KOPrefs::instance()->mTodoViewUsesSmallFont ) {
             int ps = fo.pointSize() -2;
             if ( ps > 12 )
                 ps -= 2;
             fo.setPointSize( ps );
         } 
     }
     
   mTodoListView->setFont( fo );
   // QFontMetrics fm ( KOPrefs::instance()->mTodoViewFont );
@@ -677,24 +682,41 @@ void KOTodoView::updateView()
   for(todo = todoList.first(); todo; todo = todoList.next()) {
       if (!mTodoMap.contains(todo)  && checkTodo( todo ) )
       {
       insertTodoItem(todo);
     }
   }
   //qDebug("for end ");
   // Restore opened/closed state
   mTodoListView->blockSignals( true );
   if( mDocPrefs ) restoreItemState( mTodoListView->firstChild() );
   mTodoListView->blockSignals( false );
   mTodoListView->setFocus();
+  if ( mTodoListView->firstChild ()  ) {
+      if ( oldInc ) {
+          KOTodoViewItem* item = (KOTodoViewItem*)mTodoListView->firstChild ();
+          while ( item  ) {
+              if ( item->todo() == oldInc ) {
+                  mTodoListView->setCurrentItem( item ); 
+                  mTodoListView->ensureItemVisible( item );
+                  break;
+              }
+              item = (KOTodoViewItem*)item->itemBelow();
+          }
+          if ( ! item )
+              mTodoListView->setCurrentItem( mTodoListView->firstChild () );
+      } else {
+          mTodoListView->setCurrentItem( mTodoListView->firstChild () );
+      }
+  }
   processSelectionChange();
 }
 
 bool KOTodoView::checkTodo( Todo * todo )
 {
    
     if (  !KOPrefs::instance()->mShowCompletedTodo &&  todo->isCompleted() )
         return false;
     if ( !todo->isCompleted()  ) {
         if ( todo->hasDueDate() && todo->dtDue().date() <= QDate::currentDate() )
             return true;
     }