[Libreoffice-commits] core.git: vcl/unx
Michael Meeks
michael.meeks at collabora.com
Sat Nov 15 07:09:51 PST 2014
vcl/unx/generic/window/salframe.cxx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 34c1c41817212ca95117cbd1fe582b180007945c
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 10310c0..ee94a19 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,
More information about the Libreoffice-commits
mailing list