diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-29 18:08:07 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-29 18:08:07 +0000 |
| commit | 8ce63b1df3d811bb203a9e88cb23ea9a70216c35 (patch) | |
| tree | d88cbcc03d717201bf5667220290be2d9d6dca22 /korganizer/calendarview.cpp | |
| parent | 5abbdb459be7870848ef16691174e91c68958304 (diff) | |
| download | tdepim-8ce63b1df3d811bb203a9e88cb23ea9a70216c35.tar.gz tdepim-8ce63b1df3d811bb203a9e88cb23ea9a70216c35.zip | |
* Fixed crash when modifying single instance of recurring meeeting in agenda view
* Allow CalDAV tasks read/write to continue even if events read/write failed
* Documentation cleanup
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1169577 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'korganizer/calendarview.cpp')
| -rw-r--r-- | korganizer/calendarview.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index ae4a5b6e..eb294fe7 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -1258,9 +1258,11 @@ void CalendarView::dissociateOccurrence( Incidence *incidence, const TQDate &dat Incidence* newInc = mCalendar->dissociateOccurrence( incidence, date, true ); if ( newInc ) { - // TODO: Use the same resource instead of asking again! - mChanger->changeIncidence( oldincidence, incidence ); - mChanger->addIncidence( newInc, this ); + // TODO [FIXME]: Use the same resource instead of asking again! + // See also koagenda.cpp: endItemAction() + bool success = mChanger->addIncidence( newInc, this ); + if ( success ) + mChanger->changeIncidence( oldincidence, incidence ); } else { KMessageBox::sorry( this, i18n("Dissociating the occurrence failed."), i18n("Dissociating Failed") ); |