summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2023-12-08 19:30:05 +0100
committerJosJuice <josjuice@gmail.com>2023-12-08 19:36:11 +0100
commita4eff2acc1107d8bf07e9cbc0dc8227952d8b02d (patch)
treeb729c7c1662b17976e7cefb9fd71c717438ac7da /Source/Android/app/src/main/java
parenta31214b8c65dba36c2a2edff27efddc82011737f (diff)
Android: Don't call Run before directory initialization
Combined with the previous commits, this finally fixes the bug where Dolphin had a chance of crashing if you returned to it after Android killed the Dolphin process.
Diffstat (limited to 'Source/Android/app/src/main/java')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.kt5
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.kt
index e403e7ef5d..637f4fb924 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.kt
@@ -16,6 +16,7 @@ import org.dolphinemu.dolphinemu.databinding.FragmentEmulationBinding
import org.dolphinemu.dolphinemu.features.settings.model.BooleanSetting
import org.dolphinemu.dolphinemu.features.settings.model.Settings
import org.dolphinemu.dolphinemu.overlay.InputOverlay
+import org.dolphinemu.dolphinemu.utils.AfterDirectoryInitializationRunner
import org.dolphinemu.dolphinemu.utils.Log
import java.io.File
@@ -100,7 +101,9 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
if (NativeLibrary.IsGameMetadataValid())
inputOverlay?.refreshControls()
- run(emulationActivity!!.isActivityRecreated)
+ AfterDirectoryInitializationRunner().runWithLifecycle(this) {
+ run(emulationActivity!!.isActivityRecreated)
+ }
}
override fun onPause() {