[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-0' - avmedia/source

[Zolnai Tamás]

 avmedia/source/opengl/oglplayer.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit dbf566f4ede06935fa321427a780072c94c588d7
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Fri Jul 11 07:53:19 2014 +0200

    glTF: crash after starting a model without an OpenGL window
    
    Change-Id: I726f4d62ab062fbd41376183f60c26d8e6cfe33e
    (cherry picked from commit 6174152cfffd8e31b9eda238990a161c8c2b9a71)
    Reviewed-on: https://gerrit.libreoffice.org/10220
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx
index 85daa8d..f39f847 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -144,6 +144,9 @@ void SAL_CALL OGLPlayer::start() throw ( uno::RuntimeException, std::exception )
     osl::MutexGuard aGuard(m_aMutex);
     assert(m_pHandle);
 
+    if(!m_pOGLWindow)
+        return;
+
     // gltf_animation_start play animation from the time 0.0,
     // but OGLPlayer::start used as play from that time where it was stopped before
     double fTime = gltf_animation_get_time(m_pHandle);