[Libreoffice-commits] core.git: 2 commits - avmedia/source

[Zolnai Tamás]

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

New commits:
commit 6174152cfffd8e31b9eda238990a161c8c2b9a71
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

diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx
index a4aa783..a602d3c 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);
commit 30fcee6ce56ec4e50ee86c308ca5621746d817d5
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Fri Jul 11 11:23:29 2014 +0200

    glTF: Removing one model breaks an other model
    
    Reproduce:
    - Insert two models
    - Play first model
    - Delete second model
    Result: crash (windows) or first model disappear from the
    opengl window (linux).
    
    Change-Id: I940960754f42a2e4faf5b9f37c0d4a3c155e4650

diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx
index 3f33a6c..a4aa783 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -44,6 +44,7 @@ OGLPlayer::~OGLPlayer()
                 delete [] m_pHandle->files[i].buffer;
             }
         }
+        m_aContext.makeCurrent();
         gltf_renderer_release(m_pHandle);
     }
 }