projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosdroid: Don't crash when the map is touched
[fw/altos]
/
telegps
/
TeleGPS.java
diff --git
a/telegps/TeleGPS.java
b/telegps/TeleGPS.java
index 9aaa80c3fc12e4fcf9e16cf462773e864fc9c8b9..307b56103091254848b3696dca027ab31adc657a 100644
(file)
--- a/
telegps/TeleGPS.java
+++ b/
telegps/TeleGPS.java
@@
-69,6
+69,7
@@
public class TeleGPS
AltosUIMap map;
TeleGPSInfo gps_info;
AltosUIMap map;
TeleGPSInfo gps_info;
+ TeleGPSState gps_state;
AltosInfoTable info_table;
LinkedList<AltosFlightDisplay> displays;
AltosInfoTable info_table;
LinkedList<AltosFlightDisplay> displays;
@@
-370,6
+371,7
@@
public class TeleGPS
}
private void close() {
}
private void close() {
+ disconnect();
AltosUIPreferences.unregister_font_listener(this);
AltosPreferences.unregister_units_listener(this);
setVisible(false);
AltosUIPreferences.unregister_font_listener(this);
AltosPreferences.unregister_units_listener(this);
setVisible(false);
@@
-443,13
+445,17
@@
public class TeleGPS
bag.add(pane, c);
map = new AltosUIMap();
bag.add(pane, c);
map = new AltosUIMap();
- pane.add(
"Map"
, map);
+ pane.add(
map.getName()
, map);
displays.add(map);
gps_info = new TeleGPSInfo();
displays.add(map);
gps_info = new TeleGPSInfo();
- pane.add(
"Info"
, gps_info);
+ pane.add(
gps_info.getName()
, gps_info);
displays.add(gps_info);
displays.add(gps_info);
+ gps_state = new TeleGPSState();
+ pane.add(gps_state.getName(), gps_state);
+ displays.add(gps_state);
+
info_table = new AltosInfoTable();
pane.add("Table", info_table);
displays.add(info_table);
info_table = new AltosInfoTable();
pane.add("Table", info_table);
displays.add(info_table);