summaryrefslogtreecommitdiff
path: root/src/webenginequick
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2023-05-05 14:23:55 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2023-05-16 13:29:32 +0200
commit2b24435c7f5c1a4d5de117ff92d2b3c064952143 (patch)
tree750f850506e12a1da0239f8503260e9e15ae3681 /src/webenginequick
parenta3e94d3cb6d736a039e5c6e3f6e6d22487277ec9 (diff)
downloadqtwebengine-2b24435c7f5c1a4d5de117ff92d2b3c064952143.tar.gz
Test for presence of local frame in runJavaScript
It can be missing if we are in the process of shutting down. Pick-to: 6.5 6.2 Fixes: QTBUG-113400 Change-Id: Ib494e479db08d51825c15f54354037c265ba96b0 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'src/webenginequick')
-rw-r--r--src/webenginequick/api/qquickwebengineview.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/webenginequick/api/qquickwebengineview.cpp b/src/webenginequick/api/qquickwebengineview.cpp
index f11274741..f91efc338 100644
--- a/src/webenginequick/api/qquickwebengineview.cpp
+++ b/src/webenginequick/api/qquickwebengineview.cpp
@@ -1346,7 +1346,11 @@ void QQuickWebEngineView::runJavaScript(const QString &script, quint32 worldId,
d->ensureContentsAdapter();
if (!callback.isUndefined()) {
quint64 requestId = d_ptr->adapter->runJavaScriptCallbackResult(script, worldId);
- d->m_callbacks.insert(requestId, callback);
+ if (requestId) {
+ d->m_callbacks.insert(requestId, callback);
+ } else {
+ callback.call();
+ }
} else
d->adapter->runJavaScript(script, worldId);
}