X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroid.java;h=71ac298e77b6d6000d4620db1a16eddd57871b5b;hp=4ac24053f421abdffd2ff395a30e836b0d2f769f;hb=251263f72a1c189aac709d3d0410eb916a9f66d6;hpb=51bf46248ca7ee3c817e62274b7366258c9f87cf

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 4ac24053..71ac298e 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -652,6 +652,8 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		super.onStart();
 		AltosDebug.debug("++ ON START ++");
 
+		set_switch_time();
+
 		noticeIntent(getIntent());
 
 		// Start Telemetry Service
@@ -858,13 +860,17 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 	void touch_trackers(Integer[] serials) {
 		AlertDialog.Builder builder_tracker = new AlertDialog.Builder(this);
 		builder_tracker.setTitle("Select Tracker");
-		final String[] trackers = new String[serials.length];
+		final String[] trackers = new String[serials.length + 1];
+		trackers[0] = "Auto";
 		for (int i = 0; i < serials.length; i++)
-			trackers[i] = String.format("%d", serials[i]);
+			trackers[i+1] = String.format("%d", serials[i]);
 		builder_tracker.setItems(trackers,
 					 new DialogInterface.OnClickListener() {
 						 public void onClick(DialogInterface dialog, int item) {
-							 select_tracker(Integer.parseInt(trackers[item]));
+							 if (item == 0)
+								 select_tracker(0);
+							 else
+								 select_tracker(Integer.parseInt(trackers[item]));
 						 }
 					 });
 		AlertDialog alert_tracker = builder_tracker.create();