[Libreoffice-commits] core.git: vcl/unx

[Jim Raykowski (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 3951a71777038e635e9747684806678c1c7f6612
Author:     Jim Raykowski <raykowj at gmail.com>
AuthorDate: Sat May 9 23:53:34 2020 -0800
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon May 11 17:15:02 2020 +0200

    tdf#132935 fix gtk3 submenu crash
    
    Change-Id: Icfc7d17f289bb94896e5e770c61809cb473d35a2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93943
    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 1620077aa79e..934d52f8f6f5 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -7632,6 +7632,16 @@ public:
 
     void remove(const OString& rIdent) override
     {
+        if (!m_aExtraItems.empty())
+        {
+            GtkMenuItem* pMenuItem = m_aMap[rIdent];
+            auto iter = std::find(m_aExtraItems.begin(), m_aExtraItems.end(), pMenuItem);
+            if (iter != m_aExtraItems.end())
+            {
+                m_pTopLevelMenuHelper->remove_from_map(pMenuItem);
+                m_aExtraItems.erase(iter);
+            }
+        }
         MenuHelper::remove_item(rIdent);
     }