summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-08-19 10:35:44 +0200
committerCaolán McNamara <caolanm@redhat.com>2019-08-21 17:40:40 +0200
commit635c4fc49cd48d024bf7a81acd5b36a169221510 (patch)
tree8f0c8aa266af2e5b9f653c502d415f6c2c70302d
parent5ad70db9902659065cc45727f80c54ed3772a83f (diff)
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@collabora.co.uk> (cherry picked from commit 35b41150e84940e87b9d961b6b402e3e060d6b8b) Reviewed-on: https://gerrit.libreoffice.org/77783 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 97fefe2e0870c7e62d39ba1e82e1c276c8f64ced) Reviewed-on: https://gerrit.libreoffice.org/77795 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--vcl/unx/gtk/gtksalmenu.cxx2
1 files changed, 1 insertions, 1 deletions
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;