From 17bffa8d788f0304818cb577eb8e732752fd6c68 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Tue, 20 Mar 2018 19:09:59 -0700
Subject: [PATCH] Fix race condition between polling return and onPause()

---
 .../main/java/com/limelight/AppViewShortcutTrampoline.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/java/com/limelight/AppViewShortcutTrampoline.java b/app/src/main/java/com/limelight/AppViewShortcutTrampoline.java
index 402ff076..40ac9d12 100644
--- a/app/src/main/java/com/limelight/AppViewShortcutTrampoline.java
+++ b/app/src/main/java/com/limelight/AppViewShortcutTrampoline.java
@@ -69,6 +69,13 @@ public class AppViewShortcutTrampoline extends Activity {
                                             blockingLoadSpinner = null;
                                         }
 
+                                        // If the managerBinder was destroyed before this callback,
+                                        // just finish the activity.
+                                        if (managerBinder == null) {
+                                            finish();
+                                            return;
+                                        }
+
                                         if (details.state == ComputerDetails.State.ONLINE) {
                                             // Close this activity
                                             finish();