Skip to content

Commit 9ec4353

Browse files
author
Michael Bruning
committed
Do not display context menu when pending event flag is false.
When an event filter is installed on the view, the right mouse click event may trigger Chromium to request a context menu even though the context menu events get filtered out. Removes a Q_ASSERT that would now never be triggered. Change-Id: I3ff496ec4e4ecbb4faa107f7e221765918c5fa06 Task-number: QTBUG-49092 Reviewed-by: Joerg Bornemann <[email protected]>
1 parent b27161b commit 9ec4353

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/webenginewidgets/api/qwebenginepage.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@ bool QWebEnginePage::event(QEvent *e)
700700

701701
bool QWebEnginePagePrivate::contextMenuRequested(const WebEngineContextMenuData &data)
702702
{
703-
if (!view)
703+
if (!view || !view->d_func()->m_pendingContextMenuEvent)
704704
return false;
705705

706706
QContextMenuEvent event(QContextMenuEvent::Mouse, data.pos, view->mapToGlobal(data.pos));
@@ -725,7 +725,6 @@ bool QWebEnginePagePrivate::contextMenuRequested(const WebEngineContextMenuData
725725
return false;
726726
break;
727727
}
728-
Q_ASSERT(view->d_func()->m_pendingContextMenuEvent);
729728
view->d_func()->m_pendingContextMenuEvent = false;
730729
m_menuData = WebEngineContextMenuData();
731730
return true;

0 commit comments

Comments
 (0)