From 79f03a0767c34879625fb29484e930e92a8249be Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Sun, 3 Dec 2017 14:39:00 -0800
Subject: [PATCH] Android: Fix crash on shutdown/restart.

The text drawing textures needed to be deleted before shutting down their
allocator.  Fixes #10244.
---
 android/jni/app-android.cpp                       | 4 ++--
 android/src/org/ppsspp/ppsspp/NativeActivity.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp
index 8174b1ab53..3c66be707e 100644
--- a/android/jni/app-android.cpp
+++ b/android/jni/app-android.cpp
@@ -359,10 +359,10 @@ bool AndroidVulkanContext::Init(ANativeWindow *wnd, int desiredBackbufferSizeX,
 void AndroidVulkanContext::Shutdown() {
 	ILOG("AndroidVulkanContext::Shutdown");
 	draw_->HandleEvent(Draw::Event::LOST_BACKBUFFER, g_Vulkan->GetBackbufferWidth(), g_Vulkan->GetBackbufferHeight());
-	delete draw_;
-	draw_ = nullptr;
 	ILOG("Calling NativeShutdownGraphics");
 	NativeShutdownGraphics();
+	delete draw_;
+	draw_ = nullptr;
 	g_Vulkan->WaitUntilQueueIdle();
 	g_Vulkan->DestroyObjects();
 	g_Vulkan->DestroyDevice();
diff --git a/android/src/org/ppsspp/ppsspp/NativeActivity.java b/android/src/org/ppsspp/ppsspp/NativeActivity.java
index 5601a8462d..a9b542e1c7 100644
--- a/android/src/org/ppsspp/ppsspp/NativeActivity.java
+++ b/android/src/org/ppsspp/ppsspp/NativeActivity.java
@@ -541,7 +541,7 @@ public abstract class NativeActivity extends Activity implements SurfaceHolder.C
 		if (badOrientationCount < 3 && requestedPortrait != detectedPortrait) {
 			Log.e(TAG, "Bad orientation detected (w=" + pixelWidth + " h=" + pixelHeight + "! Recreating activity.");
 			badOrientationCount++;
-			recreate();;
+			recreate();
 			return;
 		} else if (requestedPortrait == detectedPortrait) {
 			badOrientationCount = 0;