Fixing a client crash that could be triggered under certain preconditions if a ircUse...

[quassel.git] / src / client / treemodel.cpp

diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp
index 4fd2687..48394c5 100644 (file)
--- a/src/client/treemodel.cpp
+++ b/src/client/treemodel.cpp
@@ -57,13 +57,13 @@ bool AbstractTreeItem::newChilds(const QList<AbstractTreeItem *> &items) {
 }
 
 bool AbstractTreeItem::removeChild(int row) {
 }
 
 bool AbstractTreeItem::removeChild(int row) {

-  if(childCount() <= row)
+  if(row < 0 || childCount() <= row)

     return false;
 
   child(row)->removeAllChilds();
   emit beginRemoveChilds(row, row);
   AbstractTreeItem *treeitem = _childItems.takeAt(row);
     return false;
 
   child(row)->removeAllChilds();
   emit beginRemoveChilds(row, row);
   AbstractTreeItem *treeitem = _childItems.takeAt(row);

-  treeitem->deleteLater();
+  delete treeitem;

   emit endRemoveChilds();
 
   checkForDeletion();
   emit endRemoveChilds();
 
   checkForDeletion();


@@ -84,6 +84,7 @@ void AbstractTreeItem::removeAllChilds() {
   childIter = _childItems.begin();
   while(childIter != _childItems.end()) {
     child = *childIter;
   childIter = _childItems.begin();
   while(childIter != _childItems.end()) {
     child = *childIter;

+    child->setTreeItemFlags(0); // disable self deletion, as this would only fuck up consitency and the child gets deleted anyways

     child->removeAllChilds();
     childIter++;
   }
     child->removeAllChilds();
     childIter++;
   }


@@ -93,7 +94,7 @@ void AbstractTreeItem::removeAllChilds() {
   while(childIter != _childItems.end()) {
     child = *childIter;
     childIter = _childItems.erase(childIter);
   while(childIter != _childItems.end()) {
     child = *childIter;
     childIter = _childItems.erase(childIter);

-    child->deleteLater();
+    delete child;

   }
   emit endRemoveChilds();
 
   }
   emit endRemoveChilds();