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: crash when the instance window is closed before download dialog is open

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97
2025-04-11 08:38:05 +03:00
parent c430b66657
commit cc69a59f36
5 changed files with 44 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
launcher/ui/pages/instance/ShaderPackPage.cpp
View File

@ -81,8 +81,10 @@ void ShaderPackPage::downloadShaderPack()
if (m_instance->typeName() != "Minecraft")
return; // this is a null instance or a legacy instance
ResourceDownload::ShaderPackDownloadDialog mdownload(this, m_model, m_instance);
if (mdownload.exec()) {
auto mdownload = new ResourceDownload::ShaderPackDownloadDialog(this, m_model, m_instance);
mdownload->setAttribute(Qt::WA_DeleteOnClose);
connect(this, &QObject::destroyed, mdownload, &QDialog::close);
if (mdownload->exec()) {
auto tasks = new ConcurrentTask("Download Shader Packs", APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt());
connect(tasks, &Task::failed, [this, tasks](QString reason) {
CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show();
@ -100,7 +102,7 @@ void ShaderPackPage::downloadShaderPack()
tasks->deleteLater();
});
for (auto& task : mdownload.getTasks()) {
for (auto& task : mdownload->getTasks()) {
tasks->addTask(task);
}
@ -232,9 +234,11 @@ void ShaderPackPage::changeShaderPackVersion()
if (resource.metadata() == nullptr)
return;
ResourceDownload::ShaderPackDownloadDialog mdownload(this, m_model, m_instance);
mdownload.setResourceMetadata(resource.metadata());
if (mdownload.exec()) {
auto mdownload = new ResourceDownload::ShaderPackDownloadDialog(this, m_model, m_instance);
mdownload->setAttribute(Qt::WA_DeleteOnClose);
connect(this, &QObject::destroyed, mdownload, &QDialog::close);
mdownload->setResourceMetadata(resource.metadata());
if (mdownload->exec()) {
auto tasks = new ConcurrentTask("Download Shader Packs", APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt());
connect(tasks, &Task::failed, [this, tasks](QString reason) {
CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show();
@ -252,7 +256,7 @@ void ShaderPackPage::changeShaderPackVersion()
tasks->deleteLater();
});
for (auto& task : mdownload.getTasks()) {
for (auto& task : mdownload->getTasks()) {
tasks->addTask(task);
}