ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Android: Fix the logic for getting the Riivolution path
This commit is contained in:
JMC47 2022-02-11 08:26:13 -05:00 committed by GitHub
parent 9214174bb3 5dd07f73d4
commit 466bb17e55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java
View File

@ -15,6 +15,7 @@ import androidx.recyclerview.widget.RecyclerView;
import org.dolphinemu.dolphinemu.R; import org.dolphinemu.dolphinemu.R;
import org.dolphinemu.dolphinemu.activities.EmulationActivity; import org.dolphinemu.dolphinemu.activities.EmulationActivity;
import org.dolphinemu.dolphinemu.features.riivolution.model.RiivolutionPatches; import org.dolphinemu.dolphinemu.features.riivolution.model.RiivolutionPatches;
import org.dolphinemu.dolphinemu.features.settings.model.StringSetting;
import org.dolphinemu.dolphinemu.utils.DirectoryInitialization; import org.dolphinemu.dolphinemu.utils.DirectoryInitialization;
public class RiivolutionBootActivity extends AppCompatActivity public class RiivolutionBootActivity extends AppCompatActivity
@ -51,9 +52,12 @@ public class RiivolutionBootActivity extends AppCompatActivity
int revision = intent.getIntExtra(ARG_REVISION, -1); int revision = intent.getIntExtra(ARG_REVISION, -1);
int discNumber = intent.getIntExtra(ARG_DISC_NUMBER, -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); TextView textSdRoot = findViewById(R.id.text_sd_root);
String riivolutionPath = DirectoryInitialization.getUserDirectory() + "/Load/Riivolution"; textSdRoot.setText(getString(R.string.riivolution_sd_root, loadPath + "/Riivolution"));
textSdRoot.setText(getString(R.string.riivolution_sd_root, riivolutionPath));
Button buttonStart = findViewById(R.id.button_start); Button buttonStart = findViewById(R.id.button_start);
buttonStart.setOnClickListener((v) -> buttonStart.setOnClickListener((v) ->