From a5e348905a510bb2dcf6d7734f5681fb8338cd87 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 31 Aug 2014 00:11:28 -0500 Subject: [PATCH] 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 --- altoslib/AltosPreferences.java | 2 ++ altoslib/AltosTelemetryReader.java | 3 +++ 2 files changed, 5 insertions(+) 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(); + logfiles = new Hashtable(); + 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); -- 2.30.2