From 75aabd647158c93e8d46d6a1c82bee8f8d1ea7a0 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Wed, 17 May 2017 20:22:10 -0700
Subject: [PATCH] Perform cleanup tasks in onDestroy() to avoid crashing if
 onStop() is called twice

---
 app/src/main/java/com/limelight/Game.java | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/limelight/Game.java b/app/src/main/java/com/limelight/Game.java
index f96eb6b1..8984c1c7 100644
--- a/app/src/main/java/com/limelight/Game.java
+++ b/app/src/main/java/com/limelight/Game.java
@@ -405,11 +405,8 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     }
 
     @Override
-    protected void onStop() {
-        super.onStop();
-
-        SpinnerDialog.closeDialogs(this);
-        Dialog.closeDialogs();
+    protected void onDestroy() {
+        super.onDestroy();
 
         if (controllerHandler != null) {
             InputManager inputManager = (InputManager) getSystemService(Context.INPUT_SERVICE);
@@ -456,6 +453,14 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                 Toast.makeText(this, message, Toast.LENGTH_LONG).show();
             }
         }
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+
+        SpinnerDialog.closeDialogs(this);
+        Dialog.closeDialogs();
 
         finish();
     }