feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmakeProject: Fix crash when deleting while pro-files are being read

Browse Source 
Change-Id: I94c069cb806285fa23fc1a702caf620be8413e0b
Task-number: QTCREATORBUG-15954
Task-number: QTCREATORBUG-15993
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2016-04-04 11:27:19 +02:00
parent a01a0a4fed
commit 9944992345
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -300,6 +300,10 @@ QmakeProject::~QmakeProject()
{ {
m_codeModelFuture.cancel(); m_codeModelFuture.cancel();
m_asyncUpdateState = ShuttingDown; m_asyncUpdateState = ShuttingDown;
// Make sure root node (and associated readers) are shut hown before proceeding
setRootProjectNode(nullptr);
projectManager()->unregisterProject(this); projectManager()->unregisterProject(this);
delete m_projectFiles; delete m_projectFiles;
m_cancelEvaluate = true; m_cancelEvaluate = true;