From 1032e6f443803bcfb5721a6088e4809cb57417c3 Mon Sep 17 00:00:00 2001 From: Matthew Budd Date: Wed, 26 Aug 2020 22:53:39 -0400 Subject: [PATCH] Bookmark menu action memory management fix. QMenu will only delete QActions if it has ownership of the widget. --- src/drivers/Qt/HexEditor.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/drivers/Qt/HexEditor.cpp b/src/drivers/Qt/HexEditor.cpp index 18aaa3df..5bf6644b 100644 --- a/src/drivers/Qt/HexEditor.cpp +++ b/src/drivers/Qt/HexEditor.cpp @@ -379,7 +379,7 @@ HexBookMarkMenuAction::HexBookMarkMenuAction(QString desc, QWidget *parent) //---------------------------------------------------------------------------- HexBookMarkMenuAction::~HexBookMarkMenuAction(void) { - + //printf("Hex Bookmark Menu Action Deleted\n"); } //---------------------------------------------------------------------------- void HexBookMarkMenuAction::activateCB(void) @@ -597,7 +597,7 @@ void HexEditorDialog_t::populateBookmarkMenu(void) bookmarkMenu->clear(); // Bookmarks -> Remove All Bookmarks - act = new QAction(tr("Remove All Bookmarks"), this); + act = new QAction(tr("Remove All Bookmarks"), bookmarkMenu); //act->setShortcuts(QKeySequence::Open); act->setStatusTip(tr("Remove All Bookmarks")); connect(act, SIGNAL(triggered(void)), this, SLOT(removeAllBookmarks(void)) ); @@ -611,7 +611,7 @@ void HexEditorDialog_t::populateBookmarkMenu(void) if ( b ) { - hAct = new HexBookMarkMenuAction(tr(b->desc), this); + hAct = new HexBookMarkMenuAction(tr(b->desc), bookmarkMenu); bookmarkMenu->addAction(hAct); hAct->bm = b; hAct->qedit = editor; connect(hAct, SIGNAL(triggered(void)), hAct, SLOT(activateCB(void)) );