1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/debugger/qml/qmlinspectoragent.cpp b/src/plugins/debugger/qml/qmlinspectoragent.cpp
index 3f4599c49b..4057e0aeca 100644
--- a/src/plugins/debugger/qml/qmlinspectoragent.cpp
+++ b/src/plugins/debugger/qml/qmlinspectoragent.cpp
@@ -262,8 +262,7 @@ void QmlInspectorAgent::onResult(quint32 queryId, const QVariant &value,
         if (index < 0) {
             if (QTC_GUARD(m_qmlEngine))
                 m_qmlEngine->expressionEvaluated(queryId, value);
-        } else {
-            Q_ASSERT(index < m_engines.length());
+        } else if (QTC_GUARD(index < m_engines.length())) {
             const int engineId = m_engines.at(index).debugId();
             m_rootContexts.insert(engineId, qvariant_cast<ContextReference>(value));
             if (m_rootContexts.size() == m_engines.size()) {
@@ -373,7 +372,7 @@ void QmlInspectorAgent::reloadEngines()
 
 void QmlInspectorAgent::queryEngineContext()
 {
-    qCDebug(qmlInspectorLog) << __FUNCTION__;
+    qCDebug(qmlInspectorLog) << __FUNCTION__ << "pending queries:" << m_rootContextQueryIds;
 
     if (!isConnected() || !boolSetting(ShowQmlObjectTree))
         return;
@@ -381,6 +380,7 @@ void QmlInspectorAgent::queryEngineContext()
     log(LogSend, "LIST_OBJECTS");
 
     m_rootContexts.clear();
+    m_rootContextQueryIds.clear();
     for (const auto &engine : qAsConst(m_engines))
         m_rootContextQueryIds.append(m_engineClient->queryRootContexts(engine));
 }