Watch out for VehicleManager going away before a thread starts.

openxc · Aug 30, 2015 · eb357df · eb357df
1 parent 202827c
commit eb357df
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/enabler/src/main/java/com/openxc/enabler/StatusFragment.java b/enabler/src/main/java/com/openxc/enabler/StatusFragment.java
@@ -116,13 +116,17 @@ public void onServiceConnected(ComponentName className,
             new Thread(new Runnable() {
                 public void run() {
                     try {
-                        mVehicleManager.waitUntilBound();
-                        if(getActivity() != null) {
-                            getActivity().runOnUiThread(new Runnable() {
-                                public void run() {
-                                    mServiceNotRunningWarningView.setVisibility(View.GONE);
-                                }
-                            });
+                        // It's possible that between starting the thread and
+                        // this running, the manager has gone away.
+                        if(mVehicleManager != null) {
+                            mVehicleManager.waitUntilBound();
+                            if(getActivity() != null) {
+                                getActivity().runOnUiThread(new Runnable() {
+                                    public void run() {
+                                        mServiceNotRunningWarningView.setVisibility(View.GONE);
+                                    }
+                                });
+                            }
                         }
                     } catch(VehicleServiceException e) {
                         Log.w(TAG, "Unable to connect to VehicleService");