From 84e1f5834b52c76aa59bf767ac6a004e9c0701ed Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Mon, 19 Oct 2020 21:41:45 +0000
Subject: fixed crash on general plugin restart

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9510 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/qmmpui/uihelper.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'src/qmmpui/uihelper.cpp')

diff --git a/src/qmmpui/uihelper.cpp b/src/qmmpui/uihelper.cpp
index c01ff17bb..eb36246dd 100644
--- a/src/qmmpui/uihelper.cpp
+++ b/src/qmmpui/uihelper.cpp
@@ -304,7 +304,18 @@ UiHelper* UiHelper::instance()
 
 void UiHelper::removeAction(QObject *action)
 {
-    removeAction(qobject_cast<QAction *>(action));
+    for(MenuType type : m_menus.keys())
+    {
+        for(QList<QAction *>::iterator it = m_menus[type].actions.begin(); it != m_menus[type].actions.end(); ++it)
+        {
+            if(*it == action)
+            {
+                m_menus[type].actions.erase(it);
+                m_menus[type].menu->menuAction()->setVisible(!m_menus[type].autoHide || !m_menus[type].actions.isEmpty());
+                break;
+            }
+        }
+    }
 }
 
 void UiHelper::addSelectedFiles(const QStringList &files, bool play)
-- 
cgit v1.2.3-13-gbd6f