1 files changed, 9 insertions, 0 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
index 28d8dea60..2e97aee2c 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
@@ -30,6 +30,11 @@ abstract class SettingsItem(
 
     val isEditable: Boolean
         get() {
+            // Can't edit settings that aren't saveable in per-game config even if they are switchable
+            if (NativeConfig.isPerGameConfigLoaded() && !setting.isSaveable) {
+                return false
+            }
+
             if (!NativeLibrary.isRunning()) return true
 
             // Prevent editing settings that were modified in per-game config while editing global
@@ -37,6 +42,7 @@ abstract class SettingsItem(
             if (!NativeConfig.isPerGameConfigLoaded() && !setting.global) {
                 return false
             }
+
             return setting.isRuntimeModifiable
         }
 
@@ -59,6 +65,7 @@ abstract class SettingsItem(
         val emptySetting = object : AbstractSetting {
             override val key: String = ""
             override val defaultValue: Any = false
+            override val isSaveable = true
             override fun getValueAsString(needsGlobal: Boolean): String = ""
             override fun reset() {}
         }
@@ -303,6 +310,8 @@ abstract class SettingsItem(
                         BooleanSetting.FASTMEM_EXCLUSIVES.global = value
                     }
 
+                override val isSaveable = true
+
                 override fun getValueAsString(needsGlobal: Boolean): String =
                     getBoolean().toString()