summaryrefslogtreecommitdiff
path: root/altosuilib/AltosUIMap.java
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2019-09-25 13:09:22 -0700
committerKeith Packard <keithp@keithp.com>2019-09-25 13:09:22 -0700
commit35351c7db337c4384ef642fbc8b8676f0944686a (patch)
tree4420d5a01917ff86fbb27d521d16bb6737095245 /altosuilib/AltosUIMap.java
parent4df77f2ac7f34986b8e7c0584c57d77dc74d9df9 (diff)
altoslib: Don't crash when map flight data is missing
Just a couple of null pointer checks to allow the map display to come up even when no data are available. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altosuilib/AltosUIMap.java')
-rw-r--r--altosuilib/AltosUIMap.java18
1 files changed, 9 insertions, 9 deletions
diff --git a/altosuilib/AltosUIMap.java b/altosuilib/AltosUIMap.java
index 5b981d14..bd0a855c 100644
--- a/altosuilib/AltosUIMap.java
+++ b/altosuilib/AltosUIMap.java
@@ -148,16 +148,16 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
public void mouseMoved(MouseEvent e) {
AltosMapPathPoint point = map.nearest(e.getPoint().x, e.getPoint().y);
- if (nearest_mark == null)
- nearest_mark = map.add_mark(point.gps.lat,
- point.gps.lon,
- point.state);
- else {
- nearest_mark.lat_lon.lat = point.gps.lat;
- nearest_mark.lat_lon.lon = point.gps.lon;
- nearest_mark.state = point.state;
- }
if (point != null) {
+ if (nearest_mark == null)
+ nearest_mark = map.add_mark(point.gps.lat,
+ point.gps.lon,
+ point.state);
+ else {
+ nearest_mark.lat_lon.lat = point.gps.lat;
+ nearest_mark.lat_lon.lon = point.gps.lon;
+ nearest_mark.state = point.state;
+ }
nearest_label.setText(String.format("%9.2f sec %s%s%s%s",
point.time,
pos(point.gps.lat,