diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/util/WebInterfaceManager.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/util/WebInterfaceManager.kt index 7b788ab2..5d5f7dd5 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/server/util/WebInterfaceManager.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/server/util/WebInterfaceManager.kt @@ -304,11 +304,25 @@ object WebInterfaceManager { return } - val flavor = WebUIFlavor.current val servedFlavor = getServedWebUIFlavor() val log = - KotlinLogging.logger("${logger.name} setupWebUI(flavor= ${flavor.uiName}, servedFlavor= ${servedFlavor.uiName})") + KotlinLogging.logger( + "${logger.name} setupWebUI(flavor= ${WebUIFlavor.current.uiName}, servedFlavor= ${servedFlavor.uiName}, channel= ${serverConfig.webUIChannel})", + ) + + val flavor = + if (serverConfig.webUIChannel.value == WebUIChannel.BUNDLED) { + if (serverConfig.webUIFlavor.value != WebUIFlavor.default) { + log.warn { + "Changed flavor to ${WebUIFlavor.default.uiName}. Channel \"${WebUIChannel.BUNDLED}\" only works with the default flavor" + } + } + + WebUIFlavor.default + } else { + WebUIFlavor.current + } if (doesLocalWebUIExist(applicationDirs.webUIRoot)) { val currentVersion = getLocalVersion()