0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(memory leak): don't override default deconstructor + reset shared_ptr + ensure modal get's cleaned up

Browse Source 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
This commit is contained in:
Rachel Powers 2023-05-26 21:10:49 -07:00
parent aae892dfd1
commit ff03dd22fe
5 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/ui/pages/modplatform/ModPage.h
View File

@ -41,8 +41,6 @@ class ModPage : public ResourcePage {
return page; return page;
} }
~ModPage() override = default;
//: The plural version of 'mod' //: The plural version of 'mod'
[[nodiscard]] inline QString resourcesString() const override { return tr("mods"); } [[nodiscard]] inline QString resourcesString() const override { return tr("mods"); }
//: The singular version of 'mods' //: The singular version of 'mods'

2
launcher/ui/pages/modplatform/ResourceModel.cpp
View File

@ -230,7 +230,7 @@ void ResourceModel::clearData()
void ResourceModel::runSearchJob(Task::Ptr ptr) void ResourceModel::runSearchJob(Task::Ptr ptr)
{ {
m_current_search_job = ptr; m_current_search_job.reset(ptr); // clean up first
m_current_search_job->start(); m_current_search_job->start();
} }
void ResourceModel::runInfoJob(Task::Ptr ptr) void ResourceModel::runInfoJob(Task::Ptr ptr)

2
launcher/ui/pages/modplatform/ResourcePackPage.h
View File

@ -31,8 +31,6 @@ class ResourcePackResourcePage : public ResourcePage {
return page; return page;
} }
~ResourcePackResourcePage() override = default;
//: The plural version of 'resource pack' //: The plural version of 'resource pack'
[[nodiscard]] inline QString resourcesString() const override { return tr("resource packs"); } [[nodiscard]] inline QString resourcesString() const override { return tr("resource packs"); }
//: The singular version of 'resource packs' //: The singular version of 'resource packs'

2
launcher/ui/pages/modplatform/ResourcePage.cpp
View File

@ -83,6 +83,8 @@ ResourcePage::ResourcePage(ResourceDownloadDialog* parent, BaseInstance& base_in
ResourcePage::~ResourcePage() ResourcePage::~ResourcePage()
{ {
delete m_ui; delete m_ui;
if (m_model)
delete m_model;
} }
void ResourcePage::retranslate() void ResourcePage::retranslate()

2
launcher/ui/pages/modplatform/ShaderPackPage.h
View File

@ -31,8 +31,6 @@ class ShaderPackResourcePage : public ResourcePage {
return page; return page;
} }
~ShaderPackResourcePage() override = default;
//: The plural version of 'shader pack' //: The plural version of 'shader pack'
[[nodiscard]] inline QString resourcesString() const override { return tr("shader packs"); } [[nodiscard]] inline QString resourcesString() const override { return tr("shader packs"); }
//: The singular version of 'shader packs' //: The singular version of 'shader packs'