From 3b97f8b55a5dddbbb01ae93e779cf1b34f965b18 Mon Sep 17 00:00:00 2001 From: Zephyron Date: Sun, 26 Oct 2025 14:56:29 +1000 Subject: [PATCH] android: Fix crash when opening Zep Zone settings Fixed NullPointerException caused by missing EXTENDED_DYNAMIC_STATE and USE_CONDITIONAL_RENDERING entries in SettingsItem.settingsItems HashMap. These settings were referenced in the Zep Zone menu but not registered, causing the app to crash when trying to display them. Signed-off-by: Zephyron --- .../features/settings/model/view/SettingsItem.kt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/android/app/src/main/java/org/citron/citron_emu/features/settings/model/view/SettingsItem.kt b/src/android/app/src/main/java/org/citron/citron_emu/features/settings/model/view/SettingsItem.kt index 716a4387f..064fc772f 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/features/settings/model/view/SettingsItem.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/features/settings/model/view/SettingsItem.kt @@ -462,6 +462,22 @@ abstract class SettingsItem( valuesId = R.array.frameSkippingModeValues ) ) + put( + SingleChoiceSetting( + IntSetting.EXTENDED_DYNAMIC_STATE, + titleId = R.string.extended_dynamic_state, + descriptionId = R.string.extended_dynamic_state_description, + choicesId = R.array.extendedDynamicStateNames, + valuesId = R.array.extendedDynamicStateValues + ) + ) + put( + SwitchSetting( + BooleanSetting.USE_CONDITIONAL_RENDERING, + titleId = R.string.use_conditional_rendering, + descriptionId = R.string.use_conditional_rendering_description + ) + ) // Applet Mode Settings put(