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

[Maxim Monastirsky]

 vcl/unx/gtk/gtksalmenu.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 27f89f08cf4086802ce67f12389414bef6ab64ca
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Tue Mar 7 18:55:30 2017 +0200

    Destroy menu widget when enabling Unity integration
    
    Like GtkSalMenu::ShowMenuBar did before
    f2fa5951bf3d02439a3e96d1f9d89962f0901edc
    ("tdf#106271 Cannot disable Menubar under Unity")
    
    Should fix https://lists.freedesktop.org/archives/libreoffice/2017-
    March/077225.html
    
    Change-Id: I08e7486784d73f9fe1da4b21c54ac2913a8316b4

diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index 1c23cde..1b5481b 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -1155,8 +1155,11 @@ void GtkSalMenu::EnableUnity(bool bEnable)
 {
     if (bUnityMode != bEnable)
     {
-        bUnityMode = bEnable;
         static_cast<MenuBar*>(mpVCLMenu.get())->SetDisplayable(!bEnable);
+        bUnityMode = bEnable;
+
+        if (!bEnable)
+            ShowMenuBar(true);
     }
 }