1 files changed, 13 insertions, 0 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index 0e7f02f16..3f11e5aef 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -1143,6 +1143,7 @@ bool QWebEnginePagePrivate::contextMenuRequested(const WebEngineContextMenuData
         view->contextMenuEvent(&event);
         break;
     case Qt::CustomContextMenu:
+        contextData = data;
         Q_EMIT view->customContextMenuRequested(data.pos);
         break;
     case Qt::ActionsContextMenu:
@@ -1269,9 +1270,21 @@ void QWebEnginePagePrivate::startDragging(const content::DropData &dropData,
     adapter->startDragging(view, dropData, allowedActions, pixmap, offset);
 }
 
+bool QWebEnginePagePrivate::isEnabled() const
+{
+    const Q_Q(QWebEnginePage);
+    const QWidget *view = q->view();
+    if (view)
+        return view->isEnabled();
+    return true;
+}
+
 QMenu *QWebEnginePage::createStandardContextMenu()
 {
     Q_D(QWebEnginePage);
+    if (!d->contextData.d)
+        return nullptr;
+
     QMenu *menu = new QMenu(d->view);
     QAction *action = 0;
     const WebEngineContextMenuData &contextMenuData = *d->contextData.d;