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 duplicate optional mods dialog appearing when updating a modpack

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

tmp
This commit is contained in:
Trial97
2025-03-06 10:16:53 +02:00
parent 79180db663
commit 59a816c696
2 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp
View File

@ -121,6 +121,11 @@ bool ModrinthCreationTask::updateInstance()
continue;
qDebug() << "Scheduling" << file.path << "for removal";
m_files_to_remove.append(old_minecraft_dir.absoluteFilePath(file.path));
if (file.path.endsWith(".disabled")) { // remove it if it was enabled/disabled by user
m_files_to_remove.append(old_minecraft_dir.absoluteFilePath(file.path.chopped(9)));
} else {
m_files_to_remove.append(old_minecraft_dir.absoluteFilePath(file.path + ".disabled"));
}
}
}
@ -416,23 +421,30 @@ bool ModrinthCreationTask::parseManifest(const QString& index_path,
}
if (!optionalFiles.empty()) {
QStringList oFiles;
for (auto file : optionalFiles)
oFiles.push_back(file.path);
OptionalModDialog optionalModDialog(m_parent, oFiles);
if (optionalModDialog.exec() == QDialog::Rejected) {
emitAborted();
return false;
}
auto selectedMods = optionalModDialog.getResult();
for (auto file : optionalFiles) {
if (selectedMods.contains(file.path)) {
file.required = true;
} else {
file.path += ".disabled";
if (show_optional_dialog) {
QStringList oFiles;
for (auto file : optionalFiles)
oFiles.push_back(file.path);
OptionalModDialog optionalModDialog(m_parent, oFiles);
if (optionalModDialog.exec() == QDialog::Rejected) {
emitAborted();
return false;
}
auto selectedMods = optionalModDialog.getResult();
for (auto file : optionalFiles) {
if (selectedMods.contains(file.path)) {
file.required = true;
} else {
file.path += ".disabled";
}
files.push_back(file);
}
} else {
for (auto file : optionalFiles) {
file.path += ".disabled";
files.push_back(file);
}
files.push_back(file);
}
}
if (set_internal_data) {