diff options
| author | Pierre Rossi <pierre.rossi@digia.com> | 2014-02-07 21:26:20 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-31 18:36:46 +0200 |
| commit | 1f07d2929a21e51f7a920cbe5b64fb706036c88d (patch) | |
| tree | a89b531dfed45382e3e5f35e79de5a5b56c8bf31 /src/webenginewidgets/api | |
| parent | dde40e89c0da24c5e76c0f0f9f41bf78ba25efff (diff) | |
Prevent an embarassing crash
if people do something as nasty as "return this;" in createWindow.
Change-Id: Id9c3e22607e4676b7ea286a6f85816b347262615
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/webenginewidgets/api')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index e9ad17cf0..0ed9d0135 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -250,7 +250,7 @@ void QWebEnginePagePrivate::adoptNewWindow(WebContentsAdapter *newWebContents, W Q_Q(QWebEnginePage); QWebEnginePage *newPage = q->createWindow(disposition == WebContentsAdapterClient::NewPopupDisposition ? QWebEnginePage::WebModalDialog : QWebEnginePage::WebBrowserWindow); // Overwrite the new page's WebContents with ours. - if (newPage) { + if (newPage && newPage->d_func() != this) { newPage->d_func()->adapter = newWebContents; newWebContents->initialize(newPage->d_func()); if (!initialGeometry.isEmpty()) |