From 26ef19e58ba458531e8320b666299f1a311984e6 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 10 Sep 2021 16:22:25 +0200 Subject: Disconnect safely Pick-to: 6.2 Change-Id: Ic1c25724ea2d6c2241ab2665703380002efae8c3 Reviewed-by: Kirill Burtsev --- src/webenginewidgets/api/qwebengineview.cpp | 9 +++++++-- src/webenginewidgets/api/qwebengineview_p.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'src/webenginewidgets/api') 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; -- cgit v1.2.3