[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - vcl/unx

[Michael Meeks]

 vcl/unx/generic/window/salframe.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 56eacc96ab9045b3d09bc2d9ec21b771e3139f5e
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Sat Nov 15 16:09:03 2014 +0100

    vcl: avoid crash with 'gen' backend around window icons.
    
    Change-Id: I4b2bedb9ac641fcb96d09afb2e60fa2c6186fd6b

diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 6c98968..95d4ed8 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -276,9 +276,12 @@ static bool lcl_SelectAppIconPixmap( SalDisplay *pDisplay, SalX11Screen nXScreen
     aRect.mnDestX = 0; aRect.mnDestY = 0;
     aRect.mnDestWidth = iconSize; aRect.mnDestHeight = iconSize;
 
-    X11SalBitmap *pBitmap = static_cast < X11SalBitmap * >
+    X11SalBitmap *pBitmap = dynamic_cast < X11SalBitmap * >
         (aIcon.ImplGetBitmapImpBitmap()->ImplGetSalBitmap());
 
+    if (!pBitmap) // FIXME: opengl
+        return false;
+
     icon_pixmap = XCreatePixmap( pDisplay->GetDisplay(),
                                  pDisplay->GetRootWindow( nXScreen ),
                                  iconSize, iconSize,