[Libreoffice-commits] core.git: vcl/unx

[Jan-Marek Glogowski]

 vcl/unx/generic/window/salframe.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 36888dc9607b6ce1f98a0a7fcd1069ded091aec1
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Wed Nov 2 12:33:51 2016 +0100

    tdf#103626 Workaround for AppIcon recursion
    
    Change-Id: I6d39d719ad0afb593fec15c9213cc5906c711cbc
    Reviewed-on: https://gerrit.libreoffice.org/30534
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 3f4b5e8..ab8ad79 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;