From 4681db5919386642c914a1939140fb64870ab57c Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Wed, 31 Mar 2021 12:07:57 +1100 Subject: [PATCH] fixed access after delete Fixes #1538 Fixes #1541 --- app/dialog/sequence/presetmanager.h | 2 ++ app/dialog/sequence/sequencedialogpresettab.cpp | 4 +--- app/dialog/sequence/sequencedialogpresettab.h | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/dialog/sequence/presetmanager.h b/app/dialog/sequence/presetmanager.h index 3ef752f2c..42c7a418c 100644 --- a/app/dialog/sequence/presetmanager.h +++ b/app/dialog/sequence/presetmanager.h @@ -124,6 +124,8 @@ public: preset_file.close(); } + + qDeleteAll(custom_preset_data_); } QString GetPresetName(QString start) const diff --git a/app/dialog/sequence/sequencedialogpresettab.cpp b/app/dialog/sequence/sequencedialogpresettab.cpp index 69671bb10..0356c04e0 100644 --- a/app/dialog/sequence/sequencedialogpresettab.cpp +++ b/app/dialog/sequence/sequencedialogpresettab.cpp @@ -81,7 +81,7 @@ SequenceDialogPresetTab::SequenceDialogPresetTab(QWidget* parent) : SequenceDialogPresetTab::~SequenceDialogPresetTab() { - qDeleteAll(child_presets_); + qDeleteAll(default_preset_data_); } void SequenceDialogPresetTab::SaveParametersAsPreset(SequencePreset preset) @@ -235,8 +235,6 @@ void SequenceDialogPresetTab::AddItemInternal(QTreeWidgetItem *folder, Preset* p item->setData(0, kDataPresetIsCustomRole, is_custom); item->setData(0, kDataPresetDataRole, index); - child_presets_.append(preset); - folder->addChild(item); } diff --git a/app/dialog/sequence/sequencedialogpresettab.h b/app/dialog/sequence/sequencedialogpresettab.h index 557b05b25..b85027bcf 100644 --- a/app/dialog/sequence/sequencedialogpresettab.h +++ b/app/dialog/sequence/sequencedialogpresettab.h @@ -68,8 +68,6 @@ private: QVector default_preset_data_; - QVector child_presets_; - private slots: void SelectedItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);