bookmarkstaglist: Avoid leaking a menu each time it is shown

vladisslav2011 · Nov 10, 2024 · 34897c8 · 34897c8
1 parent 684b145
commit 34897c8
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 32 deletions.
diff --git a/src/qtgui/bookmarkstaglist.cpp b/src/qtgui/bookmarkstaglist.cpp
@@ -180,44 +180,46 @@ QStringList BookmarksTagList::getSelectedTags()
 
 void BookmarksTagList::ShowContextMenu(const QPoint& pos)
 {
-    QMenu* menu=new QMenu(this);
-
-    // MenuItem "Rename"
+    if(!popupMenu)
     {
-        QAction* actionRename = new QAction("Rename", this);
-        menu->addAction(actionRename);
-        connect(actionRename, SIGNAL(triggered()), this, SLOT(RenameSelectedTag()));
-    }
+        popupMenu=new QMenu(this);
 
-    // MenuItem "Create new Tag"
-    {
-        QAction* actionNewTag = new QAction("Create new Tag", this);
-        menu->addAction(actionNewTag);
-        connect(actionNewTag, SIGNAL(triggered()), this, SLOT(AddNewTag()));
-    }
+        // MenuItem "Rename"
+        {
+            QAction* actionRename = new QAction("Rename", this);
+            popupMenu->addAction(actionRename);
+            connect(actionRename, SIGNAL(triggered()), this, SLOT(RenameSelectedTag()));
+        }
 
-    // Menu "Delete Tag"
-    {
-        QAction* actionDeleteTag = new QAction("Delete Tag", this);
-        menu->addAction(actionDeleteTag);
-        connect(actionDeleteTag, SIGNAL(triggered()), this, SLOT(DeleteSelectedTag()));
-    }
+        // MenuItem "Create new Tag"
+        {
+            QAction* actionNewTag = new QAction("Create new Tag", this);
+            popupMenu->addAction(actionNewTag);
+            connect(actionNewTag, SIGNAL(triggered()), this, SLOT(AddNewTag()));
+        }
 
-    // Menu "Select All"
-    {
-        QAction* action = new QAction("Select All", this);
-        menu->addAction(action);
-        connect(action, SIGNAL(triggered()), this, SLOT(SelectAll()));
-    }
+        // Menu "Delete Tag"
+        {
+            QAction* actionDeleteTag = new QAction("Delete Tag", this);
+            popupMenu->addAction(actionDeleteTag);
+            connect(actionDeleteTag, SIGNAL(triggered()), this, SLOT(DeleteSelectedTag()));
+        }
 
-    // Menu "Deselect All"
-    {
-        QAction* action = new QAction("Deselect All", this);
-        menu->addAction(action);
-        connect(action, SIGNAL(triggered()), this, SLOT(DeselectAll()));
-    }
+        // Menu "Select All"
+        {
+            QAction* action = new QAction("Select All", this);
+            popupMenu->addAction(action);
+            connect(action, SIGNAL(triggered()), this, SLOT(SelectAll()));
+        }
 
-    menu->popup(viewport()->mapToGlobal(pos));
+        // Menu "Deselect All"
+        {
+            QAction* action = new QAction("Deselect All", this);
+            popupMenu->addAction(action);
+            connect(action, SIGNAL(triggered()), this, SLOT(DeselectAll()));
+        }
+    }
+    popupMenu->popup(viewport()->mapToGlobal(pos));
 }
 
 bool BookmarksTagList::RenameSelectedTag()

diff --git a/src/qtgui/bookmarkstaglist.h b/src/qtgui/bookmarkstaglist.h
@@ -39,6 +39,7 @@ class BookmarksTagList : public QTableWidget
 
 private:
     bool m_bShowUntagged;
+    QMenu* popupMenu{nullptr};
 
 signals: