[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-2' - slideshow/source

[Michael Meeks]

 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit bde953b84baed33098ae747c49a882e14a2bf7c7
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Wed Sep 16 02:58:16 2015 +0100

    tdf#94006 - need an explicit dispose for slideshow's GLContext.
    
    Fixes crasher exiting slideshow.
    
    Change-Id: I14b6a2c1abc946f590bf91cab19099753172fd95
    Reviewed-on: https://gerrit.libreoffice.org/18609
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/18628
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index db50970..f296866 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -1325,6 +1325,8 @@ void OGLTransitionerImpl::impl_dispose()
 {
     impl_finishTransition();
     disposeTextures();
+    if( mpContext.is() )
+        mpContext->dispose();
     mpContext.clear();
 }