X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=telegps%2FTeleGPS.java;h=41f881726af92761a5d3bb477ad4481114955a9f;hb=9d5a6914982a29d22103e0202735c9e01ee9e831;hp=d4b7bacf47b0575829a6d9f5ca93125dbe405e43;hpb=f02cc3eec53e9d703837dad55ec2e6625b192588;p=fw%2Faltos

diff --git a/telegps/TeleGPS.java b/telegps/TeleGPS.java
index d4b7bacf..41f88172 100644
--- a/telegps/TeleGPS.java
+++ b/telegps/TeleGPS.java
@@ -32,12 +32,12 @@ public class TeleGPS
 {
 
 	static String[] telegps_icon_names = {
-		"/telegps-16.png",
-		"/telegps-32.png",
-		"/telegps-48.png",
-		"/telegps-64.png",
-		"/telegps-128.png",
-		"/telegps-256.png"
+		"/altusmetrum-telegps-16.png",
+		"/altusmetrum-telegps-32.png",
+		"/altusmetrum-telegps-48.png",
+		"/altusmetrum-telegps-64.png",
+		"/altusmetrum-telegps-128.png",
+		"/altusmetrum-telegps-256.png"
 	};
 
 	static { set_icon_names(telegps_icon_names); }
@@ -67,7 +67,6 @@ public class TeleGPS
 
 	TeleGPSStatus		telegps_status;
 	TeleGPSStatusUpdate	status_update;
-	javax.swing.Timer	status_timer;
 
 	JTabbedPane		pane;
 
@@ -147,6 +146,7 @@ public class TeleGPS
 	public void show(AltosState state, AltosListenerState listener_state) {
 		try {
 			status_update.saved_state = state;
+			status_update.saved_listener_state = listener_state;
 
 			if (state == null)
 				state = new AltosState();
@@ -178,11 +178,7 @@ public class TeleGPS
 	void disconnect() {
 		setTitle("TeleGPS");
 		stop_display();
-		if (status_timer != null) {
-			status_timer.stop();
-			status_timer = null;
-			status_update = null;
-		}
+		telegps_status.stop();
 
 		telegps_status.disable_receive();
 		disable_frequency_menu();
@@ -404,8 +400,7 @@ public class TeleGPS
 	public void set_reader(AltosFlightReader reader, AltosDevice device) {
 		status_update = new TeleGPSStatusUpdate(telegps_status);
 
-		status_timer = new javax.swing.Timer(100, status_update);
-		status_timer.start();
+		telegps_status.start(status_update);
 
 		setTitle(String.format("TeleGPS %s", reader.name));
 		thread = new TeleGPSDisplayThread(this, voice(), this, reader);