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

[Maxim Monastirsky (via logerrit)]

 vcl/unx/gtk3/gtk3gtksalmenu.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9e129e8557370207f784cba0f40643044ead88be
Author:     Maxim Monastirsky <momonasmon at gmail.com>
AuthorDate: Wed Sep 30 09:29:48 2020 +0300
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Sep 30 16:55:25 2020 +0200

    Restore the fix for tdf#126830
    
    It was lost with 1ae450504cf57457f9702684b1517fda1dd3c481
    ("drop gtk2 support"), which was based on an older revision
    of gtksalmenu.cxx.
    
    In the meantime, the UI for settings icons on was hidden
    (see tdf#123265), but this can't be an excuse for carrying
    the broken code. The setting is also still available as an
    expert config.
    
    Change-Id: Iffc6342bb312230646399f2f85ef0211315f6c8a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103644
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtksalmenu.cxx b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
index 4a32af2043df..94e2134e151a 100644
--- a/vcl/unx/gtk3/gtk3gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
@@ -1018,7 +1018,7 @@ namespace
 void GtkSalMenu::NativeSetItemIcon( unsigned nSection, unsigned nItemPos, const Image& rImage )
 {
 #if GLIB_CHECK_VERSION(2,38,0)
-    if (!!rImage && mbHasNullItemIcon)
+    if (!rImage && mbHasNullItemIcon)
         return;
 
     SolarMutexGuard aGuard;