diff options
author | Bernd Weimer <bweimer@blackberry.com> | 2014-09-24 15:43:46 +0200 |
---|---|---|
committer | Bernd Weimer <bweimer@blackberry.com> | 2014-09-30 15:14:46 +0200 |
commit | 2d911d4e0926969528be8e170a02f74f4761ee25 (patch) | |
tree | 7765433254b670ce17320db42e69fba2093642a0 | |
parent | cda94f73a30cbdf3e6c32ec9a9f771d602ad1aa3 (diff) | |
download | qtmultimedia-2d911d4e0926969528be8e170a02f74f4761ee25.tar.gz |
QNX: Fix resetting video surface5.3
If video surface object is set to 0, it must not be accessed to set a
property on it.
Task-number: QTBUG-40746
Change-Id: I1de0e5495918d3ea06706412fab15bf1af012f36
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
-rw-r--r-- | src/plugins/qnx/mediaplayer/mmrendererplayervideorenderercontrol.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qnx/mediaplayer/mmrendererplayervideorenderercontrol.cpp b/src/plugins/qnx/mediaplayer/mmrendererplayervideorenderercontrol.cpp index b9fe95026..8b2f081e4 100644 --- a/src/plugins/qnx/mediaplayer/mmrendererplayervideorenderercontrol.cpp +++ b/src/plugins/qnx/mediaplayer/mmrendererplayervideorenderercontrol.cpp @@ -78,7 +78,7 @@ void MmRendererPlayerVideoRendererControl::setSurface(QAbstractVideoSurface *sur m_surface = QPointer<QAbstractVideoSurface>(surface); if (QOpenGLContext::currentContext()) m_windowGrabber->checkForEglImageExtension(); - else + else if (m_surface) m_surface->setProperty("_q_GLThreadCallback", QVariant::fromValue<QObject*>(this)); } |