summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-01-11 11:05:31 +0200
committerTor Lillqvist <tml@iki.fi>2013-01-11 11:13:06 +0200
commit4d23222b15ac0034e265441c71405a48403721f8 (patch)
treed9a3c0ebe51ddc07da5b0d65bcbd7db3d2e21664 /slideshow
parent36c5abb012e48f0c7e8b8b0d50e562b423e43869 (diff)
Avoid crash
(But the OpenGL transitions aren't really usable on the Mac. At least not when built against the 10.7 SDK.) Change-Id: I6b65b417a40be182b7b4077b420b4bdb52fb67c4
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
index 3a260e314976..06b44c7fe85a 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
@@ -398,7 +398,7 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta
awt::Rectangle aCanvasArea = mxView->getCanvasArea();
// needed in windowed mode only ?
- if( (aCanvasArea.X != 0) && (aCanvasArea.Y != 0) )
+ if( (pWindow != NULL) && (aCanvasArea.X != 0) && (aCanvasArea.Y != 0) )
pWindow->setPosSizePixel(aCanvasArea.X, aCanvasArea.Y, aCanvasArea.Width, aCanvasArea.Height);
GLWin.Width = aCanvasArea.Width;