From 4e7e5da8ebe37070c365785085c820617ff6bd8f Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 28 Feb 2017 09:36:18 +0100 Subject: [PATCH] QtSupport: Don't wait for Help initialization if plugin is disabled Change-Id: I068d25143399c09393be20b7aa32fe7c6dcb2fe9 Reviewed-by: Christian Stenger --- src/plugins/qtsupport/exampleslistmodel.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/qtsupport/exampleslistmodel.cpp b/src/plugins/qtsupport/exampleslistmodel.cpp index 24fb034746f..0c6f0af15c3 100644 --- a/src/plugins/qtsupport/exampleslistmodel.cpp +++ b/src/plugins/qtsupport/exampleslistmodel.cpp @@ -645,7 +645,11 @@ void ExampleSetModel::helpManagerInitialized() void ExampleSetModel::tryToInitialize() { - if (m_initalized || !m_qtVersionManagerInitialized || !m_helpManagerInitialized) + if (m_initalized) + return; + if (!m_qtVersionManagerInitialized) + return; + if (Core::HelpManager::instance() && !m_helpManagerInitialized) return; m_initalized = true;