Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater

2023-10-15 17:42:39 +03:00
parent 5cb6d93136 9705e6325a
commit 6bbff310bc
40 changed files with 541 additions and 134 deletions
--- a/launcher/ui/dialogs/NewInstanceDialog.cpp
+++ b/launcher/ui/dialogs/NewInstanceDialog.cpp
@ -237,8 +237,7 @@ void NewInstanceDialog::setSuggestedIcon(const QString& key)

 InstanceTask* NewInstanceDialog::extractTask()
 {
-    InstanceTask* extracted = creationTask.get();
-    creationTask.release();
+    InstanceTask* extracted = creationTask.release();

    InstanceName inst_name(ui->instNameTextBox->placeholderText().trimmed(), importVersion);
    inst_name.setName(ui->instNameTextBox->text().trimmed());