From 036551aab7f407cdbbc5f831690de20357a8152c Mon Sep 17 00:00:00 2001 From: SSimco <37044560+SSimco@users.noreply.github.com> Date: Tue, 24 Oct 2023 21:50:30 +0300 Subject: [PATCH] Fix crash in input settings fragment --- .../src/main/java/info/cemu/Cemu/InputSettingsFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/android/app/src/main/java/info/cemu/Cemu/InputSettingsFragment.java b/src/android/app/src/main/java/info/cemu/Cemu/InputSettingsFragment.java index 77e43e23..8c6c6629 100644 --- a/src/android/app/src/main/java/info/cemu/Cemu/InputSettingsFragment.java +++ b/src/android/app/src/main/java/info/cemu/Cemu/InputSettingsFragment.java @@ -23,10 +23,10 @@ public class InputSettingsFragment extends Fragment { GenericRecyclerViewAdapter genericRecyclerViewAdapter = new GenericRecyclerViewAdapter(); for (int index = 0; index < NativeLibrary.MAX_CONTROLLERS; index++) { int controllerIndex = index; - String controllerType = getString(NativeLibrary.controllerTypeToResourceNameId(NativeLibrary.getControllerType(controllerIndex))); + int controllerType = NativeLibrary.isControllerDisabled(controllerIndex) ? NativeLibrary.EMULATED_CONTROLLER_TYPE_DISABLED : NativeLibrary.getControllerType(controllerIndex); ButtonRecyclerViewItem buttonRecyclerViewItem = new ButtonRecyclerViewItem( getString(R.string.controller_numbered, controllerIndex + 1), - getString(R.string.emulated_controller_with_type, controllerType), + getString(R.string.emulated_controller_with_type, getString(NativeLibrary.controllerTypeToResourceNameId(controllerType))), () -> { Bundle bundle = new Bundle(); bundle.putInt(ControllerInputsFragment.CONTROLLER_INDEX, controllerIndex);