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

Finish parent activity after directory initializer completes 

Add frontIntent flag to control activity.finish()

Moved parent activity finish inside of performLaunchChecks
This commit is contained in:
Minh Truong 2023-12-01 13:05:24 -06:00 committed by Minh Truong
parent 5f7e9d3bf1
commit 4b91bf48f5
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.kt
View File

@ -1066,16 +1066,16 @@ class EmulationActivity : AppCompatActivity(), ThemeProvider {
}
@JvmStatic
fun launch(activity: FragmentActivity, filePaths: Array<String>, riivolution: Boolean) {
fun launch(activity: FragmentActivity, filePaths: Array<String>, riivolution: Boolean, fromIntent: Boolean = false) {
if (ignoreLaunchRequests)
return
performLaunchChecks(activity) { launchWithoutChecks(activity, filePaths, riivolution) }
performLaunchChecks(activity, fromIntent) { launchWithoutChecks(activity, filePaths, riivolution) }
}
@JvmStatic
fun launch(activity: FragmentActivity, filePath: String, riivolution: Boolean) =
launch(activity, arrayOf(filePath), riivolution)
fun launch(activity: FragmentActivity, filePath: String, riivolution: Boolean, fromIntent: Boolean = false) =
launch(activity, arrayOf(filePath), riivolution, fromIntent)
private fun launchWithoutChecks(
activity: FragmentActivity,
@ -1089,8 +1089,11 @@ class EmulationActivity : AppCompatActivity(), ThemeProvider {
activity.startActivity(launcher)
}
private fun performLaunchChecks(activity: FragmentActivity, continueCallback: Runnable) {
private fun performLaunchChecks(activity: FragmentActivity, fromIntent: Boolean, continueCallback: Runnable) {
AfterDirectoryInitializationRunner().runWithLifecycle(activity) {
if (fromIntent) {
activity.finish()
}
if (!FileBrowserHelper.isPathEmptyOrValid(StringSetting.MAIN_DEFAULT_ISO) ||
!FileBrowserHelper.isPathEmptyOrValid(StringSetting.MAIN_FS_PATH) ||
!FileBrowserHelper.isPathEmptyOrValid(StringSetting.MAIN_DUMP_PATH) ||
@ -1129,7 +1132,7 @@ class EmulationActivity : AppCompatActivity(), ThemeProvider {
if (ignoreLaunchRequests)
return
performLaunchChecks(activity) { launchSystemMenuWithoutChecks(activity) }
performLaunchChecks(activity, false) { launchSystemMenuWithoutChecks(activity) }
}
private fun launchSystemMenuWithoutChecks(activity: FragmentActivity) {

3
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/StartupHandler.java
View File

@ -37,8 +37,7 @@ public final class StartupHandler
if (gamesToLaunch != null && gamesToLaunch.length > 0)
{
// Start the emulation activity, send the ISO passed in and finish the main activity
EmulationActivity.launch(parent, gamesToLaunch, false);
parent.finish();
EmulationActivity.launch(parent, gamesToLaunch, false, true);
}
}