From 7568770078a36ed10824cce5eab9f7e4652e9045 Mon Sep 17 00:00:00 2001 From: comp500 Date: Mon, 23 May 2022 00:38:57 +0100 Subject: [PATCH] Fix optional button waiting when there are no optional mods --- .../kotlin/link/infra/packwiz/installer/UpdateManager.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/link/infra/packwiz/installer/UpdateManager.kt b/src/main/kotlin/link/infra/packwiz/installer/UpdateManager.kt index ff5deff..800320a 100644 --- a/src/main/kotlin/link/infra/packwiz/installer/UpdateManager.kt +++ b/src/main/kotlin/link/infra/packwiz/installer/UpdateManager.kt @@ -128,7 +128,9 @@ class UpdateManager internal constructor(private val opts: Options, val ui: IUse if (manifest.packFileHash?.let { packFileSource.hashIsEqual(it) } == true && invalidatedUris.isEmpty()) { // todo: --force? ui.submitProgress(InstallProgress("Modpack is already up to date!", 1, 1)) - ui.awaitOptionalButton(false) + if (manifest.cachedFiles.any { it.value.isOptional }) { + ui.awaitOptionalButton(false) + } if (!ui.optionsButtonPressed) { return } @@ -186,7 +188,9 @@ class UpdateManager internal constructor(private val opts: Options, val ui: IUse private fun processIndex(indexUri: SpaceSafeURI, indexHash: Hash, hashFormat: String, manifest: ManifestFile, invalidatedUris: List) { if (manifest.indexFileHash == indexHash && invalidatedUris.isEmpty()) { ui.submitProgress(InstallProgress("Modpack files are already up to date!", 1, 1)) - ui.awaitOptionalButton(false) + if (manifest.cachedFiles.any { it.value.isOptional }) { + ui.awaitOptionalButton(false) + } if (!ui.optionsButtonPressed) { return }