[Libreoffice-commits] core.git: vcl/unx
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Mon Nov 16 08:45:39 UTC 2020
vcl/unx/gtk3/gtk3gtkinst.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 577b6be9ba4d55804e088dabfc2f40473ea3e726
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Nov 15 20:31:10 2020 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Nov 16 09:44:57 2020 +0100
check TopLevelMenuHelper for existence
Change-Id: I84e0893b1ca271cd7460e8fb0ce20b91bf3e58d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105903
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 1b53f714a6ec..fb5227df063d 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -8182,7 +8182,8 @@ public:
auto iter = std::find(m_aExtraItems.begin(), m_aExtraItems.end(), pMenuItem);
if (iter != m_aExtraItems.end())
{
- m_pTopLevelMenuHelper->remove_from_map(pMenuItem);
+ if (m_pTopLevelMenuHelper)
+ m_pTopLevelMenuHelper->remove_from_map(pMenuItem);
m_aExtraItems.erase(iter);
}
}
More information about the Libreoffice-commits
mailing list