From 6dc6eb9ad0485f611e2eb49791475b3dd28e9aa0 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Mon, 15 May 2017 13:02:36 +0200
Subject: [PATCH] ProjectNodes: Make FolderNode::replaceSubtree safer

Make it safe for an existing note to replace itself.

Change-Id: I8ce04ea45cb851c814b9efbc7d8490c5fb44150e
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/projectexplorer/projectnodes.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/projectexplorer/projectnodes.cpp b/src/plugins/projectexplorer/projectnodes.cpp
index 38f41bcc3db..ac35aa71564 100644
--- a/src/plugins/projectexplorer/projectnodes.cpp
+++ b/src/plugins/projectexplorer/projectnodes.cpp
@@ -45,6 +45,7 @@
 #include <QDir>
 #include <QIcon>
 #include <QStyle>
+#include <QTimer>
 
 #include <memory>
 
@@ -610,7 +611,7 @@ bool FolderNode::replaceSubtree(Node *oldNode, Node *newNode)
         } else {
             removeNode(oldNode); // Happens e.g. when project is shutting down
         }
-        delete oldNode;
+        QTimer::singleShot(0, [oldNode]() { delete oldNode; });
     }
     ProjectTree::emitSubtreeChanged(this);
     return true;