summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2019-10-08 15:45:45 +0200
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2019-10-09 05:09:53 +0200
commitfd95a92d600b751ad6a23f35db446bf063cb722b (patch)
tree16c5e90a6b5d911c51a4b6bd4cebb1f5221b716b
parent74fc3dd94adeaac750e4cea08281d912dc5a11ee (diff)
tdf#124391 Fix doubled menu in global menu
Regression from 3bedbfd9b3cee5a8d2da6ee0486859bd725979ba Change-Id: I56473a2b0620f90f23b1bcde3ae1290801021038 Reviewed-on: https://gerrit.libreoffice.org/80465 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r--vcl/unx/gtk/gtksalmenu.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index 27ba8096bce8..39e1beab33e7 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -229,8 +229,12 @@ void GtkSalMenu::ImplUpdate(bool bRecurse, bool bRemoveDisabledEntries)
if (mbMenuBar && maUpdateMenuBarIdle.IsActive())
{
maUpdateMenuBarIdle.Stop();
- maUpdateMenuBarIdle.Invoke();
- return;
+ // tdf#124391 Prevent doubled menus in global menu
+ if (!bUnityMode)
+ {
+ maUpdateMenuBarIdle.Invoke();
+ return;
+ }
}
}