[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=a9f2c81

The following commit has been merged in the master branch:
commit a9f2c815a07602ee4f1d2dd3f16d44fbc80a3a89
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Mar 10 21:59:01 2011 +0000

    Fix crash when the model size and data structures came out of sync
---
 tree-node.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tree-node.cpp b/tree-node.cpp
index 8d7a912..dc370fd 100644
--- a/tree-node.cpp
+++ b/tree-node.cpp
@@ -46,9 +46,7 @@ TreeNode::TreeNode()
 
 TreeNode::~TreeNode()
 {
-    if (mPriv->mParent) {
-        mPriv->mParent->mPriv->mChildren.removeOne(this);
-    }
+
     delete mPriv;
 }
 
@@ -117,6 +115,9 @@ void TreeNode::remove()
                    SIGNAL(childrenRemoved(TreeNode*,int,int)),
                    mPriv->mParent,
                    SIGNAL(childrenRemoved(TreeNode*,int,int)));
+
+        mPriv->mParent->mPriv->mChildren.removeOne(this);
     }
+
     deleteLater();
 }
\ No newline at end of file

-- 
ktp-contact-list packaging