diff options
| author | JosJuice <josjuice@gmail.com> | 2023-07-28 18:45:07 +0200 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2023-07-28 18:45:07 +0200 |
| commit | b5b8282ca922cf960febbdf9c5aeaa2f2f35ec4d (patch) | |
| tree | 16b88aac506159fe279392ca65391d894139c960 /Source/Android/app/src/main/java | |
| parent | 17fa9dfc4e6007d497b6ae30f6651aaf38672d88 (diff) | |
Android: Fix SettingsActivity.onActivityResult
`or` is the bitwise or operator.
Fixes file pickers in the settings not saving your choice.
Diffstat (limited to 'Source/Android/app/src/main/java')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.kt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.kt index cae9f4e840..ccdbbe3339 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.kt @@ -181,11 +181,11 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView { fragment!!.adapter!!.onFilePickerConfirmation(path!!) } - MainPresenter.REQUEST_GAME_FILE - or MainPresenter.REQUEST_SD_FILE - or MainPresenter.REQUEST_WAD_FILE - or MainPresenter.REQUEST_WII_SAVE_FILE - or MainPresenter.REQUEST_NAND_BIN_FILE -> { + MainPresenter.REQUEST_GAME_FILE, + MainPresenter.REQUEST_SD_FILE, + MainPresenter.REQUEST_WAD_FILE, + MainPresenter.REQUEST_WII_SAVE_FILE, + MainPresenter.REQUEST_NAND_BIN_FILE -> { val uri = canonicalizeIfPossible(result!!.data!!) val validExtensions: Set<String> = if (requestCode == MainPresenter.REQUEST_GAME_FILE) FileBrowserHelper.GAME_EXTENSIONS else FileBrowserHelper.RAW_EXTENSION |