summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-02 08:07:04 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-02 08:07:04 +0000
commit4da59365263742bd16027434e2aa7d11e17d7909 (patch)
tree0afd8a2920802f8127c3bff81baf262e861134bb
parentc9c698138b70d52536977098de50e7b5a15ee1c4 (diff)
downloadtdepim-4da59365263742bd16027434e2aa7d11e17d7909.tar.gz
tdepim-4da59365263742bd16027434e2aa7d11e17d7909.zip
Revert commit 1170798 as it caused a crash under certain circumstances
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170826 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--korganizer/koagenda.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index a2712f0a9..8329d161c 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -1126,9 +1126,6 @@ void KOAgenda::endItemAction()
mChanger->changeIncidence( oldIncSaved, inc, wc, this );
- mActionItem->dissociateFromMultiItem();
- mActionItem->setIncidence( incToChange );
-
// mActionItem does not exist any more, seeing as we just got done deleting it
// (by deleting/replacing the original incidence it was created from through
// user modification of said incidence) above!
@@ -1147,6 +1144,9 @@ void KOAgenda::endItemAction()
break;
}
}
+
+ mActionItem->dissociateFromMultiItem();
+ mActionItem->setIncidence( incToChange );
}
}