diff options
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
| -rw-r--r-- | Source/Android/jni/MainAndroid.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index 83902892e9..23fc782aeb 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -118,7 +118,8 @@ void Host_Message(HostMessageID id) } else if (id == HostMessageID::WMUserStop) { - Core::QueueHostJob(&Core::Stop); + if (Core::IsRunning(Core::System::GetInstance())) + Core::QueueHostJob(&Core::Stop); } } @@ -276,6 +277,13 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetIsBooting JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_IsRunning(JNIEnv*, jclass) { + return s_is_booting.IsSet() || + static_cast<jboolean>(Core::IsRunning(Core::System::GetInstance())); +} + +JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_IsRunningAndStarted(JNIEnv*, + jclass) +{ return static_cast<jboolean>(Core::IsRunning(Core::System::GetInstance())); } @@ -285,13 +293,6 @@ Java_org_dolphinemu_dolphinemu_NativeLibrary_IsRunningAndUnpaused(JNIEnv*, jclas return static_cast<jboolean>(Core::GetState(Core::System::GetInstance()) == Core::State::Running); } -JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_IsUninitialized(JNIEnv*, - jclass) -{ - return static_cast<jboolean>(Core::IsUninitialized(Core::System::GetInstance()) && - !s_is_booting.IsSet()); -} - JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetVersionString(JNIEnv* env, jclass) { |