[Libreoffice-commits] core.git: Branch 'libreoffice-6-3-1' - vcl/unx

[Noel Grandin (via logerrit)]

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

New commits:
commit 635c4fc49cd48d024bf7a81acd5b36a169221510
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Aug 19 10:35:44 2019 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Aug 21 17:40:40 2019 +0200

    tdf#126830 Icons not showing in menus
    
    regression from
        commit 9eae555542ce01cb289b9e736454abcf835b8394
        Date:   Sun Apr 28 09:54:42 2019 +0200
        speed up gtk menu construction at startup
    
    Change-Id: I12327c0c62aa283c8b04a03933704082fd13463a
    Reviewed-on: https://gerrit.libreoffice.org/77702
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 35b41150e84940e87b9d961b6b402e3e060d6b8b)
    Reviewed-on: https://gerrit.libreoffice.org/77783
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit 97fefe2e0870c7e62d39ba1e82e1c276c8f64ced)
    Reviewed-on: https://gerrit.libreoffice.org/77795
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index 0d149bf4b30c..8dbd8817b1ff 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -1063,7 +1063,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;