aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSkye Deving <76892045+skyedeving@users.noreply.github.com>2021-01-07 20:44:58 -0600
committerGitHub <noreply@github.com>2021-01-07 20:44:58 -0600
commitcbf8391a65a3f0dc7816b904261b3e38275ec063 (patch)
treee671b59aa44c1e21651af70ac1d6cf8541a14881
parente2c447f1d7ff4ecde4306ecb3ac7d6683660b722 (diff)
Add QMenu delete on close attributes (#381)
Fixes a minor memory leak with context menu creation.
-rw-r--r--src/courtroom.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index ba13e216..1cd8d31d 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -3856,6 +3856,7 @@ void Courtroom::on_iniswap_context_menu_requested(const QPoint &pos)
{
QMenu *menu = ui_iniswap_dropdown->lineEdit()->createStandardContextMenu();
+ menu->setAttribute(Qt::WA_DeleteOnClose);
menu->addSeparator();
if (file_exists(ao_app->get_character_path(current_char, "char.ini")))
menu->addAction(QString("Edit " + current_char + "/char.ini"), this,
@@ -3963,6 +3964,7 @@ void Courtroom::on_sfx_context_menu_requested(const QPoint &pos)
{
QMenu *menu = ui_sfx_dropdown->lineEdit()->createStandardContextMenu();
+ menu->setAttribute(Qt::WA_DeleteOnClose);
menu->addSeparator();
if (file_exists(ao_app->get_character_path(current_char, "soundlist.ini")))
menu->addAction(QString("Edit " + current_char + "/soundlist.ini"), this,
@@ -4050,8 +4052,9 @@ void Courtroom::set_effects_dropdown()
void Courtroom::on_effects_context_menu_requested(const QPoint &pos)
{
- QMenu *menu = new QMenu();
+ QMenu *menu = new QMenu(this);
+ menu->setAttribute(Qt::WA_DeleteOnClose);
if (!ao_app->read_char_ini(current_char, "effects", "Options").isEmpty())
menu->addAction(
QString("Open misc/" +
@@ -4214,7 +4217,8 @@ void Courtroom::on_music_list_double_clicked(QTreeWidgetItem *p_item,
void Courtroom::on_music_list_context_menu_requested(const QPoint &pos)
{
- QMenu *menu = new QMenu();
+ QMenu *menu = new QMenu(this);
+ menu->setAttribute(Qt::WA_DeleteOnClose);
menu->addAction(QString(tr("Stop Current Song")), this, SLOT(music_stop()));
menu->addAction(QString(tr("Play Random Song")), this, SLOT(music_random()));
menu->addSeparator();