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

[Lubosz Sarnecki]

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

New commits:
commit 2857674b3c1b42ca1cd2f87a74e2cf92bf461f55
Author: Lubosz Sarnecki <lubosz.sarnecki at collabora.co.uk>
Date:   Fri Sep 11 14:48:26 2015 +0200

    tdf#94031 - slideshow: bind correct GL context for prepareEnvironment
    
    Change-Id: Ib139e81f770531f7d808764dd3a77c7ac8d6fa3c
    Signed-off-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/18508
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index f468f87..db50970 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -1185,6 +1185,7 @@ void OGLTransitionerImpl::GLInitSlides()
     TimerContext aTimerContext("texture creation");
 #endif
 
+    mpContext->makeCurrent();
     prepareEnvironment();
 
     const OGLFormat* pFormat = NULL;