mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 20:28:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Android: Fix SettingsActivity.onActivityResult

Browse source 
`or` is the bitwise or operator.

Fixes file pickers in the settings not saving your choice.
This commit is contained in:
JosJuice 2023-07-28 18:45:07 +02:00 • committed by Nayla Hanegan
commit 2f04404ac7
No known key found for this signature in database
GPG key ID: 3075216CED0DB01D
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.kt
View file

@ -181,11 +181,11 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView {
fragment!!.adapter!!.onFilePickerConfirmation(path!!) fragment!!.adapter!!.onFilePickerConfirmation(path!!)
} }
MainPresenter.REQUEST_GAME_FILE MainPresenter.REQUEST_GAME_FILE,
or MainPresenter.REQUEST_SD_FILE MainPresenter.REQUEST_SD_FILE,
or MainPresenter.REQUEST_WAD_FILE MainPresenter.REQUEST_WAD_FILE,
or MainPresenter.REQUEST_WII_SAVE_FILE MainPresenter.REQUEST_WII_SAVE_FILE,
or MainPresenter.REQUEST_NAND_BIN_FILE -> { MainPresenter.REQUEST_NAND_BIN_FILE -> {
val uri = canonicalizeIfPossible(result!!.data!!) val uri = canonicalizeIfPossible(result!!.data!!)
val validExtensions: Set<String> = val validExtensions: Set<String> =
if (requestCode == MainPresenter.REQUEST_GAME_FILE) FileBrowserHelper.GAME_EXTENSIONS else FileBrowserHelper.RAW_EXTENSION if (requestCode == MainPresenter.REQUEST_GAME_FILE) FileBrowserHelper.GAME_EXTENSIONS else FileBrowserHelper.RAW_EXTENSION