X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=micropeak%2FMicroPeak.java;h=19e91660d6226017cddef42640a748108d2e60e4;hb=4a5ef9eaa8b809c56813625133120e7e91fc8e65;hp=cb1c68cbba2eb7afbc55fe3580a0ff5bce1f5d2f;hpb=4ff54bb96f6c00c0c2c7dd32f81403bac331621a;p=fw%2Faltos

diff --git a/micropeak/MicroPeak.java b/micropeak/MicroPeak.java
index cb1c68cb..19e91660 100644
--- a/micropeak/MicroPeak.java
+++ b/micropeak/MicroPeak.java
@@ -23,8 +23,8 @@ import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;
-import org.altusmetrum.altoslib_1.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
 public class MicroPeak extends MicroFrame implements ActionListener, ItemListener {
 
@@ -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 {