diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/WiiUtils.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/WiiUtils.java index 2366eba33d..6b933a7879 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/WiiUtils.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/WiiUtils.java @@ -27,4 +27,6 @@ public final class WiiUtils public static native void importNANDBin(String file); public static native int doOnlineUpdate(String region, WiiUpdateCallback callback); + + public static native boolean isSystemMenuInstalled(); } diff --git a/Source/Android/jni/WiiUtils.cpp b/Source/Android/jni/WiiUtils.cpp index 8745d98bdd..2e51073659 100644 --- a/Source/Android/jni/WiiUtils.cpp +++ b/Source/Android/jni/WiiUtils.cpp @@ -9,7 +9,10 @@ #include "jni/AndroidCommon/IDCache.h" #include "Common/ScopeGuard.h" +#include "Core/CommonTitles.h" #include "Core/HW/WiiSave.h" +#include "Core/IOS/ES/ES.h" +#include "Core/IOS/IOS.h" #include "Core/WiiUtils.h" #include "DiscIO/NANDImporter.h" @@ -128,4 +131,13 @@ JNIEXPORT jint JNICALL Java_org_dolphinemu_dolphinemu_utils_WiiUtils_doOnlineUpd return ConvertUpdateResult(result); } + +JNIEXPORT jboolean JNICALL +Java_org_dolphinemu_dolphinemu_utils_WiiUtils_isSystemMenuInstalled(JNIEnv* env, jclass) +{ + IOS::HLE::Kernel ios; + const auto tmd = ios.GetES()->FindInstalledTMD(Titles::SYSTEM_MENU); + + return tmd.IsValid(); +} }