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

[Libreoffice Gerrit user]

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

New commits:
commit 4107e1c4268811623a4620eb30264b210a2acdab
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Dec 13 11:50:41 2018 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Dec 13 17:48:14 2018 +0100

    Resolves: tdf#122016 crash accessing deleted GtkSalMenu
    
    Change-Id: Ib6527e17110b55251fea9f0701d0e02f6fa5a9fe
    Reviewed-on: https://gerrit.libreoffice.org/65107
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index e504e5d7aef0..f9053ce23f6f 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -506,6 +506,8 @@ bool GtkSalMenu::ShowNativePopupMenu(FloatingWindow* pWin, 
const tools::Rectangl
     g_object_unref(mpActionGroup);
     ClearActionGroupAndMenuModel();
 
+    mpFrame = nullptr;
+
     return true;
 #else
     (void)pWin;
@@ -581,6 +583,9 @@ GtkSalMenu::~GtkSalMenu()
         g_object_unref(mpMenuModel);
 
     maItems.clear();
+
+    if (mpFrame)
+        mpFrame->SetMenu(nullptr);
 }
 
 bool GtkSalMenu::VisibleMenuBar()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits