safeDispatch/src/main/java/com/safemobile/safedispatch/HistoryActivity.java

@@ -279,6 +279,6 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
         this.googleMap.getUiSettings().setMapToolbarEnabled(false);
 
         parentTab.demoPositionsList();
-//        displayButton.performClick();
+        displayButton.performClick();
     }
 }

safeDispatch/src/main/java/com/safemobile/safedispatch/LiveActivity.java

@@ -444,6 +444,12 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
 
     public void displayVehicle(double latZoom, double lngZoom) {
         if (googleMap != null) {
+            String openWindow = "";
+            for (Marker marker : markers) {
+                if (marker.isInfoWindowShown()) {
+                    openWindow = marker.getTitle();
+                }
+            }
             googleMap.clear();
 
             for (int i = 0; i < displayedVehicles.size(); i++) {
@@ -458,8 +464,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
                         markerOptions.icon(markerIcon);
 
                         Marker marker = this.googleMap.addMarker(markerOptions);
-
+                        if (openWindow.equals(marker.getTitle()) || i == lastItemClicked) {
-                        if (i == lastItemClicked) {
                             marker.showInfoWindow();
                             googleMap.moveCamera(CameraUpdateFactory.newLatLngZoom(newLocation, 14));
                         }
@@ -469,6 +474,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
                 }
             }
         }
+        lastItemClicked = 0;
     }
 
     private BitmapDescriptor getProperBitmap(int largeIcon, String text) {

safeDispatch/src/main/java/com/safemobile/safedispatch/TabLayoutActivity.java

@@ -700,7 +700,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 			tcpTimer = null;
 		}
 
-		if (getRadioActivity() != null && getRadioActivity().audioThread != null) {
+		if (getRadioActivity().audioThread != null) {
 			Thread moribund = getRadioActivity().audioThread;
 			getRadioActivity().audioThread = null;
 			moribund.interrupt();