From 64ab351d222e2c9e55c800898e4c0d499cd5c024 Mon Sep 17 00:00:00 2001
From: OpenSauce04 <opensauce04@gmail.com>
Date: Sat, 4 Jul 2026 13:53:23 +0100
Subject: [PATCH] `combo_buttons` --> `combo_button_buttons`

---
 CMakeModules/GenerateSettingKeys.cmake                      | 2 +-
 .../org/citra/citra_emu/features/settings/SettingKeys.kt    | 2 +-
 .../citra_emu/features/settings/model/IntListSetting.kt     | 4 ++--
 .../features/settings/ui/SettingsFragmentPresenter.kt       | 6 +++---
 .../src/main/java/org/citra/citra_emu/utils/ComboHelper.kt  | 2 +-
 src/android/app/src/main/jni/default_ini.h                  | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CMakeModules/GenerateSettingKeys.cmake b/CMakeModules/GenerateSettingKeys.cmake
index 68d4a68b9..b7be40f51 100644
--- a/CMakeModules/GenerateSettingKeys.cmake
+++ b/CMakeModules/GenerateSettingKeys.cmake
@@ -241,7 +241,7 @@ if (ANDROID)
         "screen_orientation"
         "performance_overlay_position"
         "enable_secondary_display"
-        "combo_buttons"
+        "combo_button_buttons"
     )
         string(REPLACE "_" "_1" KEY_JNI_ESCAPED ${KEY})
         set(SETTING_KEY_LIST "${SETTING_KEY_LIST}\n\"${KEY}\",")
diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/SettingKeys.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/SettingKeys.kt
index 80d98a4de..955ece959 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/SettingKeys.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/SettingKeys.kt
@@ -143,5 +143,5 @@ object SettingKeys {
     external fun screen_orientation(): String
     external fun performance_overlay_position(): String
     external fun enable_secondary_display(): String
-    external fun combo_buttons(): String
+    external fun combo_button_buttons(): String
 }
diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/IntListSetting.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/IntListSetting.kt
index f5878aaf4..aa58bfb28 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/IntListSetting.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/IntListSetting.kt
@@ -23,8 +23,8 @@ enum class IntListSetting(
     /**
      * Combo Buttons will be given options on MultiChoice setting initialization. This just makes selections empty by default.
      */
-    COMBO_BUTTONS(
-        SettingKeys.combo_buttons(),
+    COMBO_BUTTON_BUTTONS(
+        SettingKeys.combo_button_buttons(),
         Settings.SECTION_CONTROLS,
         listOf(),
         canBeEmpty = true
diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt
index 353efc5fd..07429aa2e 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt
@@ -876,13 +876,13 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
 
             add(
                 MultiChoiceSetting(
-                    IntListSetting.COMBO_BUTTONS,
+                    IntListSetting.COMBO_BUTTON_BUTTONS,
                     R.string.combo_button_options,
                     R.string.combo_button_description,
                     R.array.comboOptions,
                     R.array.comboOptionValues,
-                    IntListSetting.COMBO_BUTTONS.key,
-                    IntListSetting.COMBO_BUTTONS.defaultValue
+                    IntListSetting.COMBO_BUTTON_BUTTONS.key,
+                    IntListSetting.COMBO_BUTTON_BUTTONS.defaultValue
                 )
             )
         }
diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/ComboHelper.kt b/src/android/app/src/main/java/org/citra/citra_emu/utils/ComboHelper.kt
index 7cecfefd8..38473e4f4 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/utils/ComboHelper.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/ComboHelper.kt
@@ -9,7 +9,7 @@ import org.citra.citra_emu.features.settings.model.IntListSetting
 
 object ComboHelper {
     fun comboActivate(buttonStatus: Int) {
-        val comboArray = IntListSetting.COMBO_BUTTONS.list
+        val comboArray = IntListSetting.COMBO_BUTTON_BUTTONS.list
         for (nativeButton in comboArray) {
             if (nativeButton == -1) {
                 // We don't want to parse any bad inputs here so we continue loop
diff --git a/src/android/app/src/main/jni/default_ini.h b/src/android/app/src/main/jni/default_ini.h
index 9d6f82935..551bf4cde 100644
--- a/src/android/app/src/main/jni/default_ini.h
+++ b/src/android/app/src/main/jni/default_ini.h
@@ -81,7 +81,7 @@ static const char* android_config_default_file_content = (BOOST_HANA_STRING(R"(
 )") DECLARE_KEY(use_artic_base_controller) BOOST_HANA_STRING(R"(
 
 # Listing of Combo Buttons attached to the Hotkey. (Default [] or empty)
-)") DECLARE_KEY(combo_buttons) BOOST_HANA_STRING(R"(
+)") DECLARE_KEY(combo_button_buttons) BOOST_HANA_STRING(R"(
 
 [Core]
 # Whether to use the Just-In-Time (JIT) compiler for CPU emulation