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

QbsProjectManager: Don't leak the "Reading project" progress bar.

Browse Source 
If a qbs project gets closed (e.g. due to a session switch) while the
project is being loaded, the corresponding QFuture does not get deleted
and the progress bar will be around forever. This patch fixes that.
Note: The project resolving by qbs was already correctly canceled; this
is about the visual effect only.

Change-Id: If00aed949505088cfdb87d08e26f3b62ccea5fd1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Christian Kandeler
2014-08-22 09:39:38 +02:00
parent ebf45ac677
commit da4c7b2a81
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -131,6 +131,11 @@ QbsProject::~QbsProject()
{ {
m_codeModelFuture.cancel(); m_codeModelFuture.cancel();
delete m_qbsProjectParser; delete m_qbsProjectParser;
if (m_qbsUpdateFutureInterface) {
m_qbsUpdateFutureInterface->reportCanceled();
delete m_qbsUpdateFutureInterface;
m_qbsUpdateFutureInterface = 0;
}
// Deleting the root node triggers a few things, make sure rootProjectNode // Deleting the root node triggers a few things, make sure rootProjectNode
// returns 0 already // returns 0 already