From 570e452b186992e179381d80a81a35373f99025d Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 8 Sep 2020 13:25:51 +0200 Subject: [PATCH] ProjectExplorer: Fix ToolChainManager::isLoaded() The presence of the accessor object does not indicate that the toolchains have been restored, just that the restore process has started. Change-Id: I2ae3e3b091ebeab3ad4b401a1d8dcdb6a72e1408 Reviewed-by: hjk --- src/plugins/projectexplorer/toolchainmanager.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/projectexplorer/toolchainmanager.cpp b/src/plugins/projectexplorer/toolchainmanager.cpp index 0a2936fc4be..ff1fd2f0e8e 100644 --- a/src/plugins/projectexplorer/toolchainmanager.cpp +++ b/src/plugins/projectexplorer/toolchainmanager.cpp @@ -68,6 +68,7 @@ public: QList m_toolChains; // prioritized List QVector m_languages; ToolchainDetectionSettings m_detectionSettings; + bool m_loaded = false; }; ToolChainManagerPrivate::~ToolChainManagerPrivate() @@ -127,6 +128,7 @@ void ToolChainManager::restoreToolChains() for (ToolChain *tc : d->m_accessor->restoreToolChains(Core::ICore::dialogParent())) registerToolChain(tc); + d->m_loaded = true; emit m_instance->toolChainsLoaded(); } @@ -187,7 +189,7 @@ ToolChain *ToolChainManager::findToolChain(const QByteArray &id) bool ToolChainManager::isLoaded() { - return bool(d->m_accessor); + return d->m_loaded; } void ToolChainManager::notifyAboutUpdate(ToolChain *tc)