diff options
| author | JMC47 <JMC4789@gmail.com> | 2022-02-11 08:26:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-11 08:26:13 -0500 |
| commit | 466bb17e55960b75b47cc9f8a789f080e930d40a (patch) | |
| tree | 47e0468eedf2393846938205dd46317535d4de3a /Source/Android | |
| parent | 9214174bb30fff96ebcea6a35934dae38baa8205 (diff) | |
| parent | 5dd07f73d4b91ff27a91ce2265a541462a3dfe2e (diff) | |
Merge pull request #10445 from JosJuice/android-riivolution-path
Android: Fix the logic for getting the Riivolution path
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java index c990f95dd7..7509aaf37a 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java @@ -15,6 +15,7 @@ import androidx.recyclerview.widget.RecyclerView; import org.dolphinemu.dolphinemu.R; import org.dolphinemu.dolphinemu.activities.EmulationActivity; import org.dolphinemu.dolphinemu.features.riivolution.model.RiivolutionPatches; +import org.dolphinemu.dolphinemu.features.settings.model.StringSetting; import org.dolphinemu.dolphinemu.utils.DirectoryInitialization; public class RiivolutionBootActivity extends AppCompatActivity @@ -51,9 +52,12 @@ public class RiivolutionBootActivity extends AppCompatActivity int revision = intent.getIntExtra(ARG_REVISION, -1); int discNumber = intent.getIntExtra(ARG_DISC_NUMBER, -1); + String loadPath = StringSetting.MAIN_LOAD_PATH.getStringGlobal(); + if (loadPath.isEmpty()) + loadPath = DirectoryInitialization.getUserDirectory() + "/Load"; + TextView textSdRoot = findViewById(R.id.text_sd_root); - String riivolutionPath = DirectoryInitialization.getUserDirectory() + "/Load/Riivolution"; - textSdRoot.setText(getString(R.string.riivolution_sd_root, riivolutionPath)); + textSdRoot.setText(getString(R.string.riivolution_sd_root, loadPath + "/Riivolution")); Button buttonStart = findViewById(R.id.button_start); buttonStart.setOnClickListener((v) -> |