summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2022-02-09 21:42:45 +0100
committerJosJuice <josjuice@gmail.com>2022-02-09 21:43:52 +0100
commit5dd07f73d4b91ff27a91ce2265a541462a3dfe2e (patch)
tree7e9f7cd627b329a11698404cc719255b6e090fa6 /Source/Android/app/src/main/java
parentb4c7f2b1e834ce5ea4b2301f9d4fb07c11afeabb (diff)
Android: Fix the logic for getting the Riivolution path
There is a Load path setting, so the Load part can't just be hardcoded.
Diffstat (limited to 'Source/Android/app/src/main/java')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java8
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) ->