From 4478042f4007d00b03531a6ed182f504203b0ede Mon Sep 17 00:00:00 2001
From: schroda <50052685+schroda@users.noreply.github.com>
Date: Sat, 6 Dec 2025 18:38:23 +0100
Subject: [PATCH] Fix updating server settings (#1805)

The server setting updater passed an already converted value to the setting validator, which then tried to convert the value again, which caused an error

Regression aa8d27f6792576d091350acac678ac74296cf45a
---
 .../tachidesk/server/settings/SettingsUpdater.kt | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/settings/SettingsUpdater.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/settings/SettingsUpdater.kt
index bd2046bd..3b72d7c9 100644
--- a/server/src/main/kotlin/suwayomi/tachidesk/server/settings/SettingsUpdater.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/server/settings/SettingsUpdater.kt
@@ -25,14 +25,7 @@ object SettingsUpdater {
             if (property != null) {
                 val stateFlow = property.get(serverConfig)
 
-                val maybeConvertedValue =
-                    SettingsRegistry
-                        .get(name)
-                        ?.typeInfo
-                        ?.convertToInternalType
-                        ?.invoke(value) ?: value
-
-                val validationError = SettingsValidator.validate(name, maybeConvertedValue)
+                val validationError = SettingsValidator.validate(name, value)
                 val isValid = validationError == null
 
                 if (!isValid) {
@@ -41,6 +34,13 @@ object SettingsUpdater {
                     return
                 }
 
+                val maybeConvertedValue =
+                    SettingsRegistry
+                        .get(name)
+                        ?.typeInfo
+                        ?.convertToInternalType
+                        ?.invoke(value) ?: value
+
                 // Normal update - MigratedConfigValue handles deprecated mappings automatically
                 @Suppress("UNCHECKED_CAST")
                 (stateFlow as MutableStateFlow<Any>).value = maybeConvertedValue