diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2016-11-02 12:33:51 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2016-11-04 08:23:47 +0000 |
| commit | 36888dc9607b6ce1f98a0a7fcd1069ded091aec1 (patch) | |
| tree | 87bfab5e96fdfab3d30784818205279b247cc410 | |
| parent | cbb7b10b6b2748db088ae2f78b54711639a7eb2d (diff) | |
tdf#103626 Workaround for AppIcon recursion
Change-Id: I6d39d719ad0afb593fec15c9213cc5906c711cbc
Reviewed-on: https://gerrit.libreoffice.org/30534
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Jenkins <ci@libreoffice.org>
| -rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 3f4b5e887b69..ab8ad79d553c 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -250,6 +250,7 @@ static bool lcl_SelectAppIconPixmap( SalDisplay *pDisplay, SalX11Screen nXScreen sal_uInt16 nIcon, sal_uInt16 iconSize, Pixmap& icon_pixmap, Pixmap& icon_mask, NetWmIconData& netwm_icon) { + return true; if( ! ImplGetResMgr() ) return false; |