summaryrefslogtreecommitdiff
path: root/micropeak/MicroPeak.java
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2014-02-13 21:54:46 -0700
committerBdale Garbee <bdale@gag.com>2014-02-13 21:54:46 -0700
commite77c24aaaff12669ca6970dfcca770671387f59c (patch)
treec8929f4a71290e3a3c3b6d717788ae1837b2dffa /micropeak/MicroPeak.java
parent85974eadfde6103d297498ee8c4268e28ab008ba (diff)
parentbf268354535a3a7b2e093235e5347ed2a6d809ff (diff)
Merge branch 'branch-1.3' into debian
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 {