[Libreoffice-commits] core.git: vcl/unx

[Samuel Mehrbrodt (via logerrit)]

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

New commits:
commit 1c68ab312c5473ce642f75fc35a1edd6be187489
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Mon Oct 7 12:28:21 2019 +0200
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Tue Oct 8 16:26:01 2019 +0200

    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 at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/vcl/unx/gtk3/gtk3gtksalmenu.cxx b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
index 81d5d650dd26..5431ea4010ac 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;
+            }
         }
     }