Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-12 05:07:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: use after free begone!

Browse Source 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
This commit is contained in:
Rachel Powers
2025-04-19 06:16:57 -07:00
parent da30904630
commit d0ccd110a1
10 changed files with 86 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
launcher/ui/pages/instance/ResourcePackPage.cpp
View File

@ -84,10 +84,16 @@ void ResourcePackPage::downloadResourcePacks()
if (m_instance->typeName() != "Minecraft")
return; // this is a null instance or a legacy instance
auto mdownload = new ResourceDownload::ResourcePackDownloadDialog(this, m_model, m_instance);
mdownload->setAttribute(Qt::WA_DeleteOnClose);
connect(this, &QObject::destroyed, mdownload, &QDialog::close);
if (mdownload->exec()) {
m_downloadDialog = new ResourceDownload::ResourcePackDownloadDialog(this, m_model, m_instance);
m_downloadDialog->setAttribute(Qt::WA_DeleteOnClose);
connect(this, &QObject::destroyed, m_downloadDialog, &QDialog::close);
connect(m_downloadDialog, &QDialog::finished, this, &ResourcePackPage::downloadDialogFinished);
m_downloadDialog->open();
}
void ResourcePackPage::downloadDialogFinished(int result)
{
if (result) {
auto tasks = new ConcurrentTask("Download Resource Pack", APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt());
connect(tasks, &Task::failed, [this, tasks](QString reason) {
CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show();
@ -105,8 +111,12 @@ void ResourcePackPage::downloadResourcePacks()
tasks->deleteLater();
});
for (auto& task : mdownload->getTasks()) {
tasks->addTask(task);
if (m_downloadDialog) {
for (auto& task : m_downloadDialog->getTasks()) {
tasks->addTask(task);
}
} else {
qWarning() << "ResourceDownloadDialog vanished before we could collect tasks!";
}
ProgressDialog loadDialog(this);
@ -269,4 +279,4 @@ void ResourcePackPage::changeResourcePackVersion()
m_model->update();
}
}
}