[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/korganizer/views/agendaview
From:       Allen Winter <winter () kde ! org>
Date:       2008-08-27 17:38:52
Message-ID: 1219858732.647587.24323.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 853416 by winterz:

E3 Port
SVN commit 852422 by vkrause:

Update the view correctly if an agenda item move was aborted by
cancelling one of the subsequent dialogs.

Kolab issue 2514


 M  +9 -1      koagendaview.cpp  


--- trunk/KDE/kdepim/korganizer/views/agendaview/koagendaview.cpp #853415:853416
@@ -1047,10 +1047,18 @@
 
   item->setToolTip( IncidenceFormatter::toolTipString( incidence ) );
 
-  mChanger->changeIncidence( oldIncidence, incidence );
+  const bool result = mChanger->changeIncidence( oldIncidence, incidence );
   mChanger->endChange(incidence);
   delete oldIncidence;
 
+  // Update the view correctly if an agenda item move was aborted by
+  // cancelling one of the subsequent dialogs.
+  if ( !result ) {
+    mPendingChanges = true;
+    QTimer::singleShot( 0, this, SLOT(updateView()) );
+    return;
+  }
+
   // don't update the agenda as the item already has the correct coordinates.
   // an update would delete the current item and recreate it, but we are still
   // using a pointer to that item! => CRASH
[prev in list] [next in list] [prev in thread] [next in thread]