commit 1c68ab312c5473ce642f75fc35a1edd6be187489
author Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Mon Oct 07 12:28:21 2019 +0200
committer Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tue Oct 08 16:26:01 2019 +0200
tree e2677810219c29946d6b880a0a5741ea8c40eb78
parent ea3d4e806cbdde18173da92187329f1ac2177e14

tdf#124391 Fix doubled menu in global menu

Regression from 3bedbfd9b3cee5a8d2da6ee0486859bd725979ba

Change-Id: I56473a2b0620f90f23b1bcde3ae1290801021038
Reviewed-on: https://gerrit.libreoffice.org/80367
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>

vcl/unx/gtk3/gtk3gtksalmenu.cxx

diff --git a/vcl/unx/gtk3/gtk3gtksalmenu.cxx b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
index 81d5d65..5431ea4 100644
--- a/vcl/unx/gtk3/gtk3gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
@@ -223,8 +223,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;
            }
        }
    }