From 08972d1952a4247aadb2f56c22fb5ed5d13e18e0 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 26 Nov 2020 22:46:31 +0200 Subject: [PATCH] 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 --- src/plugins/projectexplorer/treescanner.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/projectexplorer/treescanner.cpp b/src/plugins/projectexplorer/treescanner.cpp index 870ec538179..809c131df68 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(); }