diff options
| author | Keith Packard <keithp@keithp.com> | 2014-08-31 00:11:28 -0500 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-08-31 00:11:28 -0500 |
| commit | a5e348905a510bb2dcf6d7734f5681fb8338cd87 (patch) | |
| tree | 650a99d681c0a9dae4894b9b535c919c43b7ed3c | |
| parent | bc3fbcb35090be3856284ccf4d908ebf39d02bec (diff) | |
altoslib: create logfiles preference object. check link in existing_data
The logfiles preference hash wasn't getting created, resulting in
crashes.
When there was no link, don't try to load existing data.
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | altoslib/AltosPreferences.java | 2 | ||||
| -rw-r--r-- | altoslib/AltosTelemetryReader.java | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/altoslib/AltosPreferences.java b/altoslib/AltosPreferences.java index 0e91e4f4..af87b213 100644 --- a/altoslib/AltosPreferences.java +++ b/altoslib/AltosPreferences.java @@ -178,6 +178,8 @@ public class AltosPreferences { telemetry_rates = new Hashtable<Integer,Integer>(); + logfiles = new Hashtable<Integer,File>(); + voice = backend.getBoolean(voicePreference, true); callsign = backend.getString(callsignPreference,"N0CALL"); diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java index 8803e19f..7539452d 100644 --- a/altoslib/AltosTelemetryReader.java +++ b/altoslib/AltosTelemetryReader.java @@ -185,6 +185,9 @@ public class AltosTelemetryReader extends AltosFlightReader { } private static AltosFlightReader existing_data(AltosLink link) { + if (link == null) + return null; + File file = AltosPreferences.logfile(link.serial); if (file != null) { AltosStateIterable iterable = AltosStateIterable.iterable(file); |