diff --git a/Source/GUI/MainWindow.cpp b/Source/GUI/MainWindow.cpp index 6c1713f..b634d8b 100755 --- a/Source/GUI/MainWindow.cpp +++ b/Source/GUI/MainWindow.cpp @@ -141,6 +141,7 @@ void MainWindow::startSeedFinder() m_btnReset->setEnabled(true); m_btnRerollPrediciton->setEnabled(true); } + delete wizard; } void MainWindow::resetPredictor() @@ -172,4 +173,5 @@ void MainWindow::openSettings() { DlgSettings* dlg = new DlgSettings(this); dlg->exec(); + delete dlg; } diff --git a/Source/GUI/SeedFinder/SeedFinderWizard.cpp b/Source/GUI/SeedFinder/SeedFinderWizard.cpp index f23320d..1602f5a 100755 --- a/Source/GUI/SeedFinder/SeedFinderWizard.cpp +++ b/Source/GUI/SeedFinder/SeedFinderWizard.cpp @@ -54,6 +54,12 @@ SeedFinderWizard::SeedFinderWizard(QWidget* parent, const GUICommon::gameSelecti [=](long value) { m_dlgProgressPrecalc->setValue(value); }); } +SeedFinderWizard::~SeedFinderWizard() +{ + for (auto page : m_passPages) + delete page; +} + std::vector SeedFinderWizard::getSeeds() const { return m_seeds; @@ -75,6 +81,7 @@ SeedFinderPassPage* SeedFinderWizard::getSeedFinderPassPageForGame() default: return nullptr; } + m_passPages.append(page); QString strResultStatus("No passes done"); if (m_seeds.size() > 1) strResultStatus = QString::number(m_seeds.size()) + QString(" results"); @@ -138,6 +145,7 @@ void SeedFinderWizard::precalcDone() "any subsequent seed finding procedure with the given settings.", QMessageBox::Ok); msg->exec(); + delete msg; m_usePrecalc = true; } } @@ -196,6 +204,7 @@ void SeedFinderWizard::pageChanged() m_dlgProgressPrecalc->exec(); delete m_dlgProgressPrecalc; } + delete msg; } } } @@ -217,7 +226,7 @@ void SeedFinderWizard::reject() else { QMessageBox* cancelPrompt = - new QMessageBox(QMessageBox::Information, "Seed Finder Cancellation", + new QMessageBox(QMessageBox::Question, "Seed Finder Cancellation", "Are you sure you want to cancel the seed finding procedure?", QMessageBox::No | QMessageBox::Yes, this); cancelPrompt->exec(); @@ -227,6 +236,7 @@ void SeedFinderWizard::reject() m_seedFinderFuture.waitForFinished(); QWizard::reject(); } + delete cancelPrompt; } } diff --git a/Source/GUI/SeedFinder/SeedFinderWizard.h b/Source/GUI/SeedFinder/SeedFinderWizard.h index 3bd7f53..716de05 100755 --- a/Source/GUI/SeedFinder/SeedFinderWizard.h +++ b/Source/GUI/SeedFinder/SeedFinderWizard.h @@ -8,6 +8,7 @@ #include #include #include +#include #include "../../Common/CommonTypes.h" #include "../GUICommon.h" @@ -31,6 +32,7 @@ class SeedFinderWizard : public QWizard SeedFinderWizard(QWidget* parent, const GUICommon::gameSelection game, const int rtcErrorMarginSeconds, const bool useWii); + ~SeedFinderWizard(); void accept() override; void reject() override; @@ -54,6 +56,7 @@ class SeedFinderWizard : public QWizard bool m_seedFinderDone = false; std::vector m_seeds; + QVector m_passPages; GUICommon::gameSelection m_game; bool m_cancelSeedFinderPass; bool m_cancelPrecalc = false; diff --git a/Source/GUI/Settings/DlgSettings.cpp b/Source/GUI/Settings/DlgSettings.cpp index 9b10595..f145945 100755 --- a/Source/GUI/Settings/DlgSettings.cpp +++ b/Source/GUI/Settings/DlgSettings.cpp @@ -49,6 +49,14 @@ DlgSettings::DlgSettings(QWidget* parent) : QDialog(parent) m_oldPlatform = m_generalTab->getPlatform(); } +DlgSettings::~DlgSettings() +{ + delete m_buttonsDlg; + delete m_generalTab; + delete m_coloTab; + delete m_xdTab; +} + void DlgSettings::loadSettings() { m_generalTab->setPlatform(SConfig::getInstance().getPlatform()); @@ -100,6 +108,7 @@ void DlgSettings::precalcDeletePrompt() const if (xdFile.exists()) xdFile.remove(); } + delete msg; } } } diff --git a/Source/GUI/Settings/DlgSettings.h b/Source/GUI/Settings/DlgSettings.h index 0d23ee3..6e25191 100755 --- a/Source/GUI/Settings/DlgSettings.h +++ b/Source/GUI/Settings/DlgSettings.h @@ -13,6 +13,7 @@ class DlgSettings : public QDialog { public: DlgSettings(QWidget* parent = nullptr); + ~DlgSettings(); private: void loadSettings();