aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2020-11-26 22:46:31 +0200
committerOrgad Shaneh <orgads@gmail.com>2020-11-27 09:15:42 +0000
commit08972d1952a4247aadb2f56c22fb5ed5d13e18e0 (patch)
tree5b9649b010d73a927d08fd8f74930c47abe3e50b
parentae794d5914d37e575fe75510f5ab2b339843da36 (diff)
ProjectExplorer: Fix crash on close while tree is scanned
* Open CMakeLists.txt of Qt Creator * While it scans the tree, close Qt Creator Change-Id: Ieabec0f7fe0495f68e833d7ced03076bc1ceddbb Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--src/plugins/projectexplorer/treescanner.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/treescanner.cpp b/src/plugins/projectexplorer/treescanner.cpp
index 870ec53817..809c131df6 100644
--- a/src/plugins/projectexplorer/treescanner.cpp
+++ b/src/plugins/projectexplorer/treescanner.cpp
@@ -103,11 +103,12 @@ TreeScanner::Result TreeScanner::result() const
TreeScanner::Result TreeScanner::release()
{
- if (isFinished()) {
+ if (isFinished() && m_scanFuture.resultCount() > 0) {
auto result = m_scanFuture.result();
m_scanFuture = Future();
return result;
}
+ m_scanFuture = Future();
return Result();
}