front: Fix issue with saving state twice on shutdown

mupen64plus-ae · Aug 31, 2016 · b575a66 · b575a66
1 parent 1d2d650
commit b575a66
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/paulscode/android/mupen64plusae/game/GameActivity.java b/src/paulscode/android/mupen64plusae/game/GameActivity.java
@@ -383,7 +383,11 @@ protected void onPause()
 
         Log.i( "GameActivity", "onPause" );
         mIsResumed = false;
-        tryPausing();
+
+        if(!mShuttingDown)
+        {
+            tryPausing();
+        }
 
         if (mSensorController != null) {
             mSensorController.onPause();
@@ -705,7 +709,6 @@ public void onExit(boolean shouldExit)
         if(shouldExit)
         {
             mMogaController.exit();
-            mShuttingDown = true;
             shutdownEmulator();
         }
         else if( !mDrawerLayout.isDrawerOpen( GravityCompat.START ))
@@ -915,6 +918,8 @@ private void tryRunning()
 
     private void shutdownEmulator()
     {
+        mShuttingDown = true;
+
         CoreInterface.addOnStateCallbackListener( new CoreInterface.OnStateCallbackListener()
         {
             @Override