diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2024-05-23 00:04:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-23 00:04:05 +0200 |
| commit | e0e09d1074ee5b067d92cc50c093992fe9dca7a5 (patch) | |
| tree | 0ce30ae3c29daaa4d762d9198e8e12ef823f3a9e /Source/Android/app/src/main/java | |
| parent | 578a3ce543d38fcfd4015d81cb9d548214fde653 (diff) | |
| parent | 7a4740adf7a68490f465fbbbc575d816a79f66db (diff) | |
Merge pull request #12792 from JosJuice/android-vibrators-crash
Android: Fix crash when no devices have outputs
Diffstat (limited to 'Source/Android/app/src/main/java')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/ui/AdvancedMappingDialog.kt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/ui/AdvancedMappingDialog.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/ui/AdvancedMappingDialog.kt index 72d08c26aa..d390601667 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/ui/AdvancedMappingDialog.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/ui/AdvancedMappingDialog.kt @@ -101,8 +101,8 @@ class AdvancedMappingDialog( return } else if (!isInput) { // Find the first device that has an output. (Most built-in devices don't have any) - val deviceWithOutputs = devices.first { deviceHasOutputs(it) } - if (deviceWithOutputs.isNotEmpty()) { + val deviceWithOutputs = devices.firstOrNull { deviceHasOutputs(it) } + if (deviceWithOutputs != null) { setSelectedDevice(deviceWithOutputs) binding.dropdownDevice.setText(deviceWithOutputs, false) return |