diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-09-10 16:22:25 +0200 |
|---|---|---|
| committer | Kirill Burtsev <kirill.burtsev@qt.io> | 2021-09-30 18:32:13 +0200 |
| commit | 26ef19e58ba458531e8320b666299f1a311984e6 (patch) | |
| tree | 1a84f44497b26244a282b01741971189579dd68f /src | |
| parent | c4336ceb2e334aa3c43de4188cbf89537aacb659 (diff) | |
Disconnect safely
Pick-to: 6.2
Change-Id: Ic1c25724ea2d6c2241ab2665703380002efae8c3
Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
Diffstat (limited to 'src')
4 files changed, 12 insertions, 3 deletions
diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp index 635bb10ea..6414ac050 100644 --- a/src/webenginewidgets/api/qwebengineview.cpp +++ b/src/webenginewidgets/api/qwebengineview.cpp @@ -644,9 +644,14 @@ QWebEnginePage* QWebEngineView::page() const void QWebEngineView::setPage(QWebEnginePage *newPage) { + Q_D(QWebEngineView); + if (d->page) { + disconnect(d->m_pageConnection); + d->m_pageConnection = {}; + } QWebEngineViewPrivate::bindPageAndView(newPage, this); - connect(newPage, &QWebEnginePage::_q_aboutToDelete, this, - [newPage]() { QWebEngineViewPrivate::bindPageAndView(newPage, nullptr); }); + d->m_pageConnection = connect(newPage, &QWebEnginePage::_q_aboutToDelete, this, + [newPage]() { QWebEngineViewPrivate::bindPageAndView(newPage, nullptr); }); auto profile = newPage->profile(); if (!profile->notificationPresenter()) profile->setNotificationPresenter(&defaultNotificationPresenter); diff --git a/src/webenginewidgets/api/qwebengineview_p.h b/src/webenginewidgets/api/qwebengineview_p.h index c34aec09a..b5d38a6c1 100644 --- a/src/webenginewidgets/api/qwebengineview_p.h +++ b/src/webenginewidgets/api/qwebengineview_p.h @@ -111,6 +111,7 @@ public: bool isVisible() const override; QRect viewportRect() const override; QWebEnginePage *page; + QMetaObject::Connection m_pageConnection; bool m_dragEntered; mutable bool m_ownsPage; QWebEngineContextMenuRequest *m_contextRequest; diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp index 5a447ef1d..aa136b662 100644 --- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp +++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp @@ -469,9 +469,11 @@ void RenderWidgetHostViewQtDelegateWidget::onWindowPosChanged() void RenderWidgetHostViewQtDelegateWidget::adapterClientChanged(WebContentsAdapterClient *client) { + if (m_pageDestroyedConnection) + disconnect(m_pageDestroyedConnection); QWebEnginePage *page = static_cast<QWebEnginePagePrivate *>(client)->q_func(); QWebEngineViewPrivate::bindPageAndWidget(page, this); - connect(page, &QWebEnginePage::_q_aboutToDelete, this, + m_pageDestroyedConnection = connect(page, &QWebEnginePage::_q_aboutToDelete, this, [this]() { QWebEngineViewPrivate::bindPageAndWidget(nullptr, this); }); } diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h index d1414a918..1adebd3b5 100644 --- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h +++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h @@ -112,6 +112,7 @@ private: QList<QMetaObject::Connection> m_windowConnections; QWebEnginePage *m_page = nullptr; QMetaObject::Connection m_parentDestroyedConnection; + QMetaObject::Connection m_pageDestroyedConnection; }; #if QT_CONFIG(accessibility) |