ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fixed asan complains

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2024-02-18 16:49:10 +02:00
parent b4f3a969b3
commit 038d3e4596
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
launcher/java/download/ArchiveDownloadTask.cpp
View File

@ -49,7 +49,10 @@ void ArchiveDownloadTask::executeTask()
download->addNetAction(action); download->addNetAction(action);
auto fullPath = entry->getFullPath(); auto fullPath = entry->getFullPath();
connect(download.get(), &NetJob::finished, [download, this] { disconnect(this, &Task::aborted, download.get(), &NetJob::abort); }); connect(download.get(), &NetJob::finished, [download, this] {
disconnect(this, &Task::aborted, download.get(), &NetJob::abort);
download->deleteLater();
});
connect(download.get(), &NetJob::failed, this, &ArchiveDownloadTask::emitFailed); connect(download.get(), &NetJob::failed, this, &ArchiveDownloadTask::emitFailed);
connect(this, &Task::aborted, download.get(), &NetJob::abort); connect(this, &Task::aborted, download.get(), &NetJob::abort);
connect(download.get(), &Task::progress, this, &ArchiveDownloadTask::setProgress); connect(download.get(), &Task::progress, this, &ArchiveDownloadTask::setProgress);

5
launcher/java/download/ManifestDownloadTask.cpp
View File

@ -51,7 +51,10 @@ void ManifestDownloadTask::executeTask()
} }
download->addNetAction(action); download->addNetAction(action);
connect(download.get(), &NetJob::finished, [download, this] { disconnect(this, &Task::aborted, download.get(), &NetJob::abort); }); connect(download.get(), &NetJob::finished, [download, this] {
disconnect(this, &Task::aborted, download.get(), &NetJob::abort);
download->deleteLater();
});
connect(download.get(), &NetJob::failed, this, &ManifestDownloadTask::emitFailed); connect(download.get(), &NetJob::failed, this, &ManifestDownloadTask::emitFailed);
connect(this, &Task::aborted, download.get(), &NetJob::abort); connect(this, &Task::aborted, download.get(), &NetJob::abort);
connect(download.get(), &Task::progress, this, &ManifestDownloadTask::setProgress); connect(download.get(), &Task::progress, this, &ManifestDownloadTask::setProgress);

3
launcher/ui/pages/global/JavaPage.cpp
View File

@ -135,7 +135,7 @@ void JavaPage::loadSettings()
ui->skipJavaWizardCheckbox->setChecked(s->get("IgnoreJavaWizard").toBool()); ui->skipJavaWizardCheckbox->setChecked(s->get("IgnoreJavaWizard").toBool());
ui->autodetectJavaCheckBox->setChecked(s->get("AutomaticJavaSwitch").toBool()); ui->autodetectJavaCheckBox->setChecked(s->get("AutomaticJavaSwitch").toBool());
ui->autodownloadCheckBox->setChecked(s->get("AutomaticJavaSwitch").toBool() && s->get("AutomaticJavaDownload").toBool()); ui->autodownloadCheckBox->setChecked(s->get("AutomaticJavaSwitch").toBool() && s->get("AutomaticJavaDownload").toBool());
m_extra_paths = new QStringListModel(s->get("JavaExtraSearchPaths").toStringList()); m_extra_paths = new QStringListModel(s->get("JavaExtraSearchPaths").toStringList(), this);
ui->extraJavaPathsList->setModel(m_extra_paths); ui->extraJavaPathsList->setModel(m_extra_paths);
} }
@ -199,6 +199,7 @@ void JavaPage::on_javaDownloadBtn_clicked()
{ {
auto jdialog = new Java::Downloader(this); auto jdialog = new Java::Downloader(this);
jdialog->exec(); jdialog->exec();
ui->managedJavaList->loadList();
} }
void JavaPage::on_maxMemSpinBox_valueChanged([[maybe_unused]] int i) void JavaPage::on_maxMemSpinBox_valueChanged([[maybe_unused]] int i)