summaryrefslogtreecommitdiff
path: root/micropeak/MicroPeak.java
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2014-02-07 22:45:26 -0800
committerKeith Packard <keithp@keithp.com>2014-02-07 22:45:26 -0800
commit28d5239bff234cc1158a270a29c0e39067f613c3 (patch)
tree1278ca410f2b08e69a220802b282283e511489a6 /micropeak/MicroPeak.java
parent8d0d59c51138dc1b1bbf6933354fe9faf4d67986 (diff)
micropeak: Missing a couple of new exceptions when loading files
The change to keep reading on invalid chars from the serial port exposed a couple of new exceptions from the MicroData code which the file loading code needs to cope with. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'micropeak/MicroPeak.java')
-rw-r--r--micropeak/MicroPeak.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/micropeak/MicroPeak.java b/micropeak/MicroPeak.java
index 2a8e2ca6..78bc857e 100644
--- a/micropeak/MicroPeak.java
+++ b/micropeak/MicroPeak.java
@@ -65,6 +65,10 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene
try {
data = new MicroData((InputStream) fis, filename.getName());
AltosUIPreferences.set_last_logdir(filename);
+ } catch (MicroData.NonHexcharException nhe) {
+ data = null;
+ } catch (MicroData.FileEndedException nhe) {
+ data = null;
} catch (InterruptedException ie) {
data = null;
} finally {