diff options
| author | 2024-02-21 08:17:30 -0500 | |
|---|---|---|
| committer | 2024-02-21 08:17:30 -0500 | |
| commit | 45f450fca5c7fabbb30e0d193d1f4a1be6bd287b (patch) | |
| tree | a1c12ef885a07cc0a405e9fd655810d2d8760857 | |
| parent | android: Enable all controller styles on emulation shutdown (diff) | |
| download | yuzu-45f450fca5c7fabbb30e0d193d1f4a1be6bd287b.tar.gz yuzu-45f450fca5c7fabbb30e0d193d1f4a1be6bd287b.tar.xz yuzu-45f450fca5c7fabbb30e0d193d1f4a1be6bd287b.zip | |
android: Add additional check for hasMapping
Controls can have no mapping if they are either "[empty]" or and empty string. This was causing an issue if you reset mapping on all controllers and then tried to play a game. The check to determine whether auto mapping was required would fail and leave you will no mapped controllers. This feels a bit like user error but it smooths things out if you forget so I see it as necessary.
| -rw-r--r-- | src/android/app/src/main/java/org/yuzu/yuzu_emu/features/input/model/PlayerInput.kt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/input/model/PlayerInput.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/input/model/PlayerInput.kt index d35de80c4..a84ac77a2 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/input/model/PlayerInput.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/input/model/PlayerInput.kt | |||
| @@ -64,17 +64,17 @@ data class PlayerInput( | |||
| 64 | fun hasMapping(): Boolean { | 64 | fun hasMapping(): Boolean { |
| 65 | var hasMapping = false | 65 | var hasMapping = false |
| 66 | buttons.forEach { | 66 | buttons.forEach { |
| 67 | if (it != "[empty]") { | 67 | if (it != "[empty]" && it.isNotEmpty()) { |
| 68 | hasMapping = true | 68 | hasMapping = true |
| 69 | } | 69 | } |
| 70 | } | 70 | } |
| 71 | analogs.forEach { | 71 | analogs.forEach { |
| 72 | if (it != "[empty]") { | 72 | if (it != "[empty]" && it.isNotEmpty()) { |
| 73 | hasMapping = true | 73 | hasMapping = true |
| 74 | } | 74 | } |
| 75 | } | 75 | } |
| 76 | motions.forEach { | 76 | motions.forEach { |
| 77 | if (it != "[empty]") { | 77 | if (it != "[empty]" && it.isNotEmpty()) { |
| 78 | hasMapping = true | 78 | hasMapping = true |
| 79 | } | 79 | } |
| 80 | } | 80 | } |