vcl/unx/generic/window/salframe.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
New commits: commit d1c2076453bd415a57da3589046938994d07649a Author: Michael Meeks <michael.me...@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, _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits