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

[Zolnai Tamás]

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

New commits:
commit 099a7f3039607eb56c433e8eebf8be02eb229c54
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
    (cherry picked from commit 30fcee6ce56ec4e50ee86c308ca5621746d817d5)
    Reviewed-on: https://gerrit.libreoffice.org/10219
    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 b481943..85daa8d 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);
     }
 }