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

List:       kde-commits
Subject:    branches/KDE/3.5/kdepim/korganizer
From:       Till Adam <adam () kde ! org>
Date:       2007-06-02 7:35:58
Message-ID: 1180769758.350793.20764.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 670622 by tilladam:

Backport of:

------------------------------------------------------------------------
r670485 | tilladam | 2007-06-01 19:17:18 +0200 (Fri, 01 Jun 2007) | 3 lines

Don't crash when two "should I send an email" dialogs come
up. (Kolab issue 1642)
------------------------------------------------------------------------


 M  +2 -1      koagenda.cpp  
 M  +4 -4      koagendaview.cpp  


--- branches/KDE/3.5/kdepim/korganizer/koagenda.cpp #670621:670622
@@ -1044,6 +1044,7 @@
   setCursor( arrowCursor );
   bool multiModify = false;
   // FIXME: do the cloning here...
+  Incidence* inc = mActionItem->incidence();
 
   if ( mItemMoved ) {
     bool modify = true;
@@ -1146,7 +1147,7 @@
       emit itemModified( modif );
     }
     // FIXME: If the change failed, we need to update the view!
-    mChanger->endChange( mActionItem->incidence() );
+    mChanger->endChange( inc );
   }
 
   mActionItem = 0;
--- branches/KDE/3.5/kdepim/korganizer/koagendaview.cpp #670621:670622
@@ -1174,15 +1174,15 @@
     td->setDtDue( endDt );
   }
 
-  mChanger->changeIncidence( oldIncidence, incidence );
-  mChanger->endChange(incidence);
-  delete oldIncidence;
-
   item->setItemDate( startDt.date() );
 
   KOIncidenceToolTip::remove( item );
   KOIncidenceToolTip::add( item, incidence, KOAgendaItem::toolTipGroup() );
 
+  mChanger->changeIncidence( oldIncidence, incidence );
+  mChanger->endChange(incidence);
+  delete oldIncidence;
+
   // 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]