Merge pull request #10445 from JosJuice/android-riivolution-path

Android: Fix the logic for getting the Riivolution path
dolphin-emu · Feb 11, 2022 · 466bb17 · 466bb17
2 parents 9214174 + 5dd07f7
commit 466bb17
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/.../main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java b/.../main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java
@@ -15,6 +15,7 @@
 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 @@ protected void onCreate(Bundle savedInstanceState)
     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) ->