summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@nokia.com>2011-12-07 17:51:24 +0100
committerDaniel Teske <daniel.teske@nokia.com>2011-12-08 12:29:44 +0100
commit9fb2a23a31182814a1c568fd0589de7093d65b92 (patch)
tree5292312e274a5b2e8c92691939e9991cf8452b2e
parentb0b0842b03320d03d335ee40d361d774e93ee2f4 (diff)
downloadqt-creator-9fb2a23a31182814a1c568fd0589de7093d65b92.tar.gz
Fix a crash on closing a project while a parse is in progress
Task-Number: QTCREATORBUG-6677 Change-Id: I01dd37fabafd8cd056cd4051b8377c6167453cb6 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
-rw-r--r--src/plugins/qt4projectmanager/qt4project.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 447ed98a7e..3b5616ab08 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -344,7 +344,11 @@ Qt4Project::~Qt4Project()
m_manager->unregisterProject(this);
delete m_projectFiles;
m_cancelEvaluate = true;
- delete m_rootProjectNode;
+ // Deleting the root node triggers a few things, make sure rootProjectNode
+ // returns 0 already
+ Qt4ProFileNode *root = m_rootProjectNode;
+ m_rootProjectNode = 0;
+ delete root;
}
void Qt4Project::updateFileList()