Android: Shutdown on finish().

hrydgard · Sep 11, 2016 · 98b523e · 98b523e
1 parent 92d9308
commit 98b523e
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/android/src/org/ppsspp/ppsspp/NativeActivity.java b/android/src/org/ppsspp/ppsspp/NativeActivity.java
@@ -584,11 +584,11 @@ protected void onStop() {
     	Log.i(TAG, "onStop - do nothing special");
     }
 
-    @Override
+	@Override
 	protected void onDestroy() {
 		super.onDestroy();
-	    if (javaGL) {
-	      	Log.i(TAG, "onDestroy");
+		if (javaGL) {
+			Log.i(TAG, "onDestroy");
 			mGLSurfaceView.onDestroy();
 			nativeRenderer.onDestroyed();
 			NativeApp.audioShutdown();
@@ -597,8 +597,8 @@ protected void onDestroy() {
 			audioFocusChangeListener = null;
 			audioManager = null;
 			unregisterCallbacks();
-	    }
-		if (shuttingDown) {
+		}
+		if (shuttingDown || isFinishing()) {
 			NativeApp.shutdown();
 		}
 	}