From 9944992345c4f9016a217fe4b30b2f8e30492c7e Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 4 Apr 2016 11:27:19 +0200 Subject: [PATCH] QmakeProject: Fix crash when deleting while pro-files are being read Change-Id: I94c069cb806285fa23fc1a702caf620be8413e0b Task-number: QTCREATORBUG-15954 Task-number: QTCREATORBUG-15993 Reviewed-by: Orgad Shaneh --- src/plugins/qmakeprojectmanager/qmakeproject.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index 5080114428c..bc07296e53b 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -300,6 +300,10 @@ QmakeProject::~QmakeProject() { m_codeModelFuture.cancel(); m_asyncUpdateState = ShuttingDown; + + // Make sure root node (and associated readers) are shut hown before proceeding + setRootProjectNode(nullptr); + projectManager()->unregisterProject(this); delete m_projectFiles; m_cancelEvaluate = true;