From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Mon, 4 Aug 2008 15:53:28 +0000 (+0200)
Subject: fixed a newly introduced crash on user mode changes
X-Git-Tag: 0.3.0~120
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=f8557ba65eb38ac4988bfbbb2c4ef579d4534cf0;hp=3033999cfae93d1cc513bfb7494e0bb578457110

fixed a newly introduced crash on user mode changes
---

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;
 }