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

[Samuel Mehrbrodt (via logerrit)]

 vcl/unx/gtk/gtksalmenu.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit fd95a92d600b751ad6a23f35db446bf063cb722b
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Tue Oct 8 15:45:45 2019 +0200
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Wed Oct 9 05:09:53 2019 +0200

    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 at ubuntu.com>

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;
+            }
         }
     }