diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-27 03:02:00 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-27 03:02:00 +0200 |
| commit | 1912876140e33e34203f45ad1d483f1b1c120e16 (patch) | |
| tree | 21b54af6d889e115a8cc8965e69af242f94e9c18 | |
| parent | e95ef6fdb6401325e5aecd2806788a5dc33a0b47 (diff) | |
| parent | c320888ff64d81e5e291eb5db683b000b9fe59a8 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Id3551a28a02dbf8bd2091961d38a1f880f82f105
| -rw-r--r-- | src/plugins/platforms/webgl/qwebglcontext.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/webgl/qwebglcontext.cpp b/src/plugins/platforms/webgl/qwebglcontext.cpp index 9d48d74..07378a2 100644 --- a/src/plugins/platforms/webgl/qwebglcontext.cpp +++ b/src/plugins/platforms/webgl/qwebglcontext.cpp @@ -1570,6 +1570,8 @@ QWebGLFunctionCall *QWebGLContext::createEvent(const QString &functionName, bool auto context = QOpenGLContext::currentContext(); Q_ASSERT(context); const auto handle = static_cast<QWebGLContext *>(context->handle()); + if (!handle) + return nullptr; auto integrationPrivate = QWebGLIntegrationPrivate::instance(); const auto clientData = integrationPrivate->findClientData(handle->currentSurface()); if (!clientData || !clientData->socket |