diff options
Diffstat (limited to 'Source/Android')
4 files changed, 24 insertions, 23 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java index dc3c48c338..0595100e09 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java @@ -400,6 +400,8 @@ public final class NativeLibrary */ public static native void StopEmulation(); + public static native void WaitUntilDoneBooting(); + /** * Returns true if emulation is running (or is paused). */ diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java index 518a7bc38c..ad97625af0 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java @@ -235,10 +235,6 @@ public final class EmulationActivity extends AppCompatActivity { super.onCreate(savedInstanceState); - // Find the EmulationFragment - mEmulationFragment = (EmulationFragment) getSupportFragmentManager() - .findFragmentById(R.id.frame_emulation_fragment); - if (savedInstanceState == null) { // Get params we were passed @@ -251,9 +247,7 @@ public final class EmulationActivity extends AppCompatActivity } else { - // Could have recreated the activity(rotate) before creating the fragment. If the fragment - // doesn't exist, treat this as a new start. - activityRecreated = mEmulationFragment != null; + activityRecreated = true; restoreState(savedInstanceState); } @@ -311,9 +305,10 @@ public final class EmulationActivity extends AppCompatActivity setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE); } - if (!(mDeviceHasTouchScreen && lockLandscape && - getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) && - mEmulationFragment == null) + // Find or create the EmulationFragment + mEmulationFragment = (EmulationFragment) getSupportFragmentManager() + .findFragmentById(R.id.frame_emulation_fragment); + if (mEmulationFragment == null) { mEmulationFragment = EmulationFragment.newInstance(mPaths); getSupportFragmentManager().beginTransaction() diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java index 1ff9ba8ea0..64959601bb 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java @@ -316,8 +316,6 @@ public final class EmulationFragment extends Fragment implements SurfaceHolder.C state = State.PAUSED; Log.debug("[EmulationFragment] Pausing emulation."); - // Release the surface before pausing, since emulation has to be running for that. - NativeLibrary.SurfaceDestroyed(); NativeLibrary.PauseEmulation(); } else @@ -381,19 +379,17 @@ public final class EmulationFragment extends Fragment implements SurfaceHolder.C mSurface = null; Log.debug("[EmulationFragment] Surface destroyed."); - if (state == State.RUNNING) + if (state != State.STOPPED) { - NativeLibrary.SurfaceDestroyed(); - state = State.PAUSED; - } - else if (state == State.PAUSED) - { - Log.warning("[EmulationFragment] Surface cleared while emulation paused."); - } - else - { - Log.warning("[EmulationFragment] Surface cleared while emulation stopped."); + // In order to avoid dereferencing nullptr, we must not destroy the surface while booting + // the core, so wait here if necessary. An easy (but not 100% consistent) way to reach + // this method while the core is booting is by having landscape orientation lock enabled + // and starting emulation while the phone is in portrait mode, leading to the activity + // being recreated very soon after NativeLibrary.Run has been called. + NativeLibrary.WaitUntilDoneBooting(); } + + NativeLibrary.SurfaceDestroyed(); } } diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index e1b19314c3..66d7b0a1bb 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -197,6 +197,8 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_PauseEmulati jobject obj); JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_StopEmulation(JNIEnv* env, jobject obj); +JNIEXPORT void JNICALL +Java_org_dolphinemu_dolphinemu_NativeLibrary_WaitUntilDoneBooting(JNIEnv* env, jobject obj); JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_IsRunning(JNIEnv* env, jobject obj); JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onGamePadEvent( @@ -283,6 +285,12 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_StopEmulatio s_update_main_frame_event.Set(); // Kick the waiting event } +JNIEXPORT void JNICALL +Java_org_dolphinemu_dolphinemu_NativeLibrary_WaitUntilDoneBooting(JNIEnv* env, jobject obj) +{ + Core::WaitUntilDoneBooting(); +} + JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_IsRunning(JNIEnv* env, jobject obj) { |