diff options
| author | Keith Packard <keithp@keithp.com> | 2013-04-12 01:00:36 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-04-12 01:00:36 -0700 |
| commit | 1ec6fb3b9cec0f864d6e65d0cc6b4dd42edd3e16 (patch) | |
| tree | 4457c5b08569b74e15e131d365af7941ed010582 /altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java | |
| parent | 02243463adbdfb860f69580f544da9026dc7cbd4 (diff) | |
altosdroid: Check state.gps != null before using it
Avoid crashing.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java')
| -rw-r--r-- | altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index b1d080db..cf4227ca 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java @@ -233,9 +233,12 @@ public class AltosDroid extends FragmentActivity { AltosGreatCircle from_receiver = null; if (saved_location != null && state.gps != null && state.gps.locked) { + double altitude = 0; + if (saved_location.hasAltitude()) + altitude = saved_location.getAltitude(); from_receiver = new AltosGreatCircle(saved_location.getLatitude(), saved_location.getLongitude(), - saved_location.getAltitude(), + altitude, state.gps.lat, state.gps.lon, state.gps.alt); @@ -248,7 +251,7 @@ public class AltosDroid extends FragmentActivity { mRSSIView.setText(String.format("%d", state.data.rssi)); for (AltosDroidTab mTab : mTabs) - mTab.update_ui(state, from_receiver); + mTab.update_ui(state, from_receiver, saved_location); mAltosVoice.tell(state); } |