[Libreoffice-commits] .: slideshow/source

[Thorsten Behrens]

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

New commits:
commit cea6f569d8ba245a2eb7563bc77273341e509af1
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Wed Oct 27 16:19:57 2010 +0200

    Fix crash in OGL transitions
    
    Seems on sufficiently slow displays, the disposeTextures() call
    comes before any window / context has been setup. Fixed along the
    lines of fdo#31072.

diff --git a/slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx
index 5aedfce..3378408 100644
--- a/slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx
@@ -1211,6 +1211,9 @@ void OGLTransitionerImpl::disposeContextAndWindow()
 
 void OGLTransitionerImpl::disposeTextures()
 {
+    if( !GLWin.ctx )
+        return;
+
 #ifdef WNT
     wglMakeCurrent(GLWin.hDC,GLWin.hRC);
 #endif
@@ -1308,11 +1311,21 @@ OGLTransitionerImpl::OGLTransitionerImpl(OGLTransitionImpl* pOGLTransition) :
     GLenteringSlide( 0 ), 
     pWindow( NULL ), 
     mxView(),
+    mxLeavingBitmap(),
+    mxEnteringBitmap(),
     EnteringBytes(),
     LeavingBytes(),
+#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
+    LeavingPixmap(0),
+    EnteringPixmap(0),
+#endif
     mbRestoreSync( false ),
     mbUseLeavingPixmap( false ),
     mbUseEnteringPixmap( false ),
+    mbFreeLeavingPixmap( false ),
+    mbFreeEnteringPixmap( false ),
+    maLeavingPixmap(0),
+    maEnteringPixmap(0),
     SlideBitmapLayout(),
     SlideSize(),
     pTransition(pOGLTransition)