diff --git a/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigModule.kt b/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigModule.kt index 035e1177..3f82f66c 100644 --- a/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigModule.kt +++ b/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigModule.kt @@ -22,7 +22,6 @@ class SystemPropertyOverrideDelegate(val config: Config, val moduleName: String) inline operator fun getValue(thisRef: R, property: KProperty<*>): T { val configValue: T = config.getValue(thisRef, property) - println("getting " + "suwayomi.tachidesk.config.$moduleName.${property.name}") val combined = System.getProperty( "suwayomi.tachidesk.config.$moduleName.${property.name}", configValue.toString() diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/JavalinSetup.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/JavalinSetup.kt index 1cbc04d1..1c08e88c 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/server/JavalinSetup.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/server/JavalinSetup.kt @@ -50,7 +50,7 @@ object JavalinSetup { config.enableCorsForAllOrigins() }.events { event -> event.serverStarted { - if (serverConfig.webUIEnabled && serverConfig.initialOpenInBrowserEnabled) { + if (serverConfig.initialOpenInBrowserEnabled) { Browser.openInBrowser() } } diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/util/Browser.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/util/Browser.kt index 6c8dccc3..bd9ffcc7 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/server/util/Browser.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/server/util/Browser.kt @@ -17,18 +17,20 @@ object Browser { private val electronInstances = mutableListOf() fun openInBrowser() { - if (serverConfig.webUIBrowser == ("electron")) { - try { - val electronPath = serverConfig.electronPath - electronInstances.add(ProcessBuilder(electronPath, appBaseUrl).start()) - } catch (e: Throwable) { // cover both java.lang.Exception and java.lang.Error - e.printStackTrace() - } - } else { - try { - Desktop.browseURL(appBaseUrl) - } catch (e: Throwable) { // cover both java.lang.Exception and java.lang.Error - e.printStackTrace() + if (serverConfig.webUIEnabled) { + if (serverConfig.webUIBrowser == ("electron")) { + try { + val electronPath = serverConfig.electronPath + electronInstances.add(ProcessBuilder(electronPath, appBaseUrl).start()) + } catch (e: Throwable) { // cover both java.lang.Exception and java.lang.Error + e.printStackTrace() + } + } else { + try { + Desktop.browseURL(appBaseUrl) + } catch (e: Throwable) { // cover both java.lang.Exception and java.lang.Error + e.printStackTrace() + } } } }