X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Ftreemodel.cpp;h=3b18d036565ce071130e7aa82169a7f08fee26f1;hp=48394c5ee29c1e231f219304ba3be3b654e5198c;hb=f8557ba65eb38ac4988bfbbb2c4ef579d4534cf0;hpb=3033999cfae93d1cc513bfb7494e0bb578457110;ds=sidebyside

diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp
index 48394c5e..3b18d036 100644
--- a/src/client/treemodel.cpp
+++ b/src/client/treemodel.cpp
@@ -117,14 +117,16 @@ bool AbstractTreeItem::reParent(AbstractTreeItem *newParent) {
   parent()->_childItems.removeAt(oldRow);
   emit parent()->endRemoveChilds();
 
-  parent()->checkForDeletion();
-
+  AbstractTreeItem *oldParent = parent();
   setParent(newParent);
 
   bool success = newParent->newChild(this);
   if(!success)
     qWarning() << "AbstractTreeItem::reParent(): failed to attach to new parent after removing from old parent! this:" << this << "new parent:" << newParent;
 
+  if(oldParent)
+    oldParent->checkForDeletion();
+
   return success;
 }