From 2c216c9a2b5c2f87a5e516c78946204e5eead807 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sun, 25 Sep 2022 22:15:15 +0200 Subject: [PATCH] Android: Improve checking in MainPresenter.launchWiiSystemMenu Not only SystemMenuNotInstalledDialogFragment requires directory initialization to have completed, but also isSystemMenuInstalled. --- .../dolphinemu/ui/main/MainPresenter.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java index 382dbc274d..09152f1bcb 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java @@ -317,20 +317,20 @@ public final class MainPresenter private void launchWiiSystemMenu() { - if (WiiUtils.isSystemMenuInstalled()) + new AfterDirectoryInitializationRunner().runWithLifecycle(mActivity, () -> { - EmulationActivity.launchSystemMenu(mActivity); - } - else - { - new AfterDirectoryInitializationRunner().runWithLifecycle(mActivity, () -> + if (WiiUtils.isSystemMenuInstalled()) + { + EmulationActivity.launchSystemMenu(mActivity); + } + else { SystemMenuNotInstalledDialogFragment dialogFragment = new SystemMenuNotInstalledDialogFragment(); dialogFragment .show(mActivity.getSupportFragmentManager(), "SystemMenuNotInstalledDialogFragment"); - }); - } + } + }); } }