commit 4107e1c4268811623a4620eb30264b210a2acdab
author Caolán McNamara <caolanm@redhat.com> Thu Dec 13 11:50:41 2018 +0000
committer Caolán McNamara <caolanm@redhat.com> Thu Dec 13 17:48:14 2018 +0100
tree f4f8eecbc3ee451860d34fdcf629b79c3c68971e
parent f890035cf98cdd86d661dc3a6d29ac2f0308d2f4

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 <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

vcl/unx/gtk/gtksalmenu.cxx

diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index e504e5d..f9053ce 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()