summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-09-16 02:58:16 +0100
committerJan Holesovsky <kendy@collabora.com>2015-09-16 16:26:18 +0000
commitbde953b84baed33098ae747c49a882e14a2bf7c7 (patch)
treef0b5ba779f7baadf592d60cf83fdf84c1322ffb8
parent41c56c26285307eb451819d49c47d7623c4555e2 (diff)
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@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/18628 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
-rw-r--r--slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index db5097083cc6..f29686696237 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();
}