From 7dd23ac750226746f340df64107dab84cd7ea113 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 7 Aug 2020 20:18:10 -0700 Subject: [PATCH] micropeak: Check for empty data when fetching log Don't pop up the graph window and don't save data from an erased device. Signed-off-by: Keith Packard --- micropeak/MicroDownload.java | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/micropeak/MicroDownload.java b/micropeak/MicroDownload.java index 1ede2d9a..be5a8568 100644 --- a/micropeak/MicroDownload.java +++ b/micropeak/MicroDownload.java @@ -64,21 +64,27 @@ public class MicroDownload extends AltosUIDialog implements Runnable, ActionList } private void done_internal() { - setVisible(false); - dispose(); - if (data != null && data.crc_valid) { - status_value.setText("Received MicroPeak Data"); - owner = owner.SetData(data); - MicroSave save = new MicroSave(owner, data); - if (save.runDialog()) - owner.SetName(data.name); + if (data.nsamples == 0) { + JOptionPane.showMessageDialog(owner, + "No Flight Data Present", + "Empty Log", + JOptionPane.WARNING_MESSAGE); + } else { + status_value.setText("Received MicroPeak Data"); + owner = owner.SetData(data); + MicroSave save = new MicroSave(owner, data); + if (save.runDialog()) + owner.SetName(data.name); + } } else { JOptionPane.showMessageDialog(owner, "Download Failed", "Flight data corrupted", JOptionPane.ERROR_MESSAGE); } + setVisible(false); + dispose(); } public void drain_queue() { -- 2.30.2