commit eccf0193885d1e46a207966eb52a408dc60e8109
author Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tue Oct 08 15:45:45 2019 +0200
committer Adolfo Jayme Barrientos <fitojb@ubuntu.com> Wed Oct 09 05:09:16 2019 +0200
tree 248e2b724021ef5b4237ed0dbadb5dac247f7ec0
parent cc03bfe99271f33a38b50778c078f66497bf11f5

tdf#124391 Fix doubled menu in global menu

Regression from 3bedbfd9b3cee5a8d2da6ee0486859bd725979ba

Change-Id: I56473a2b0620f90f23b1bcde3ae1290801021038
Reviewed-on: https://gerrit.libreoffice.org/80464
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

vcl/unx/gtk/gtksalmenu.cxx

diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index 8dbd881..91946e0 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;
            }
        }
    }