summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-12-15 14:58:49 +0000
committerMichael Stahl <michael.stahl@allotropia.de>2021-12-16 11:00:45 +0100
commit0b54949053bea786e5543ed87ab6dc9a99c00876 (patch)
tree69a7caeef2e5a99fbe56177545922ca35a84d291
parent1f7f15eb41a76e0dee17dead3aad0baca2451d94 (diff)
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 <sbergman@redhat.com> (cherry picked from commit 0e89f357b1b0bcee94568f7b221972ef3a7ba7b3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126880 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Michael Stahl <michael.stahl@allotropia.de>
-rw-r--r--vcl/unx/gtk3/gtksalmenu.cxx1
1 files changed, 1 insertions, 0 deletions
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;
}
}