vcl/unx/gtk3/gtksalmenu.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0b54949053bea786e5543ed87ab6dc9a99c00876
Author:     Caolán McNamara <[email protected]>
AuthorDate: Wed Dec 15 14:58:49 2021 +0000
Commit:     Michael Stahl <[email protected]>
CommitDate: Thu Dec 16 11:00:45 2021 +0100

    unset mpMenuBarWidget when it was destroyed along with its parent
    
    Resolves: https://github.com/flathub/org.libreoffice.LibreOffice/issues/173
    Change-Id: I875cf658fb86adfa389429ead059bfd7c4f08ef4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126887
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <[email protected]>
    (cherry picked from commit 0e89f357b1b0bcee94568f7b221972ef3a7ba7b3)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126880
    Reviewed-by: Xisco Fauli <[email protected]>
    Reviewed-by: Michael Stahl <[email protected]>
    Tested-by: Michael Stahl <[email protected]>

diff --git a/vcl/unx/gtk3/gtksalmenu.cxx b/vcl/unx/gtk3/gtksalmenu.cxx
index e9e6508ef407..1ae30b05a5b8 100644
--- a/vcl/unx/gtk3/gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtksalmenu.cxx
@@ -1114,6 +1114,7 @@ void GtkSalMenu::DestroyMenuBarWidget()
         g_clear_pointer(&mpMenuBarContainerWidget, gtk_widget_unparent);
 #endif
         mpMenuBarContainerWidget = nullptr;
+        mpMenuBarWidget = nullptr;
         mpCloseButton = nullptr;
     }
 }

Reply via email to