X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosConfig.java;h=2cf69525fea1e468d5ab40a502b224d9c64530bd;hb=e0dfa934ba76d6f913af37999e05c20e614bd3e9;hp=4927d3f822e0ad9b73fc2cf6c1fab9c9137eb456;hpb=2120d362cefceba69e75996b6391d9558978c01d;p=fw%2Faltos

diff --git a/altosui/AltosConfig.java b/altosui/AltosConfig.java
index 4927d3f8..2cf69525 100644
--- a/altosui/AltosConfig.java
+++ b/altosui/AltosConfig.java
@@ -22,8 +22,8 @@ import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.text.*;
-import org.altusmetrum.altoslib_1.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
 public class AltosConfig implements ActionListener {
 
@@ -161,9 +161,9 @@ public class AltosConfig implements ActionListener {
 			} finally {
 				try {
 					stop_serial();
+					serial_line.close();
 				} catch (InterruptedException ie) {
 				}
-				serial_line.close();
 			}
 		}
 
@@ -242,9 +242,15 @@ public class AltosConfig implements ActionListener {
 
 		/* Pull data out of the UI and stuff back into our local data record */
 
-		data.get_values(config_ui);
-
-		run_serial_thread(serial_mode_save);
+		try {
+			data.get_values(config_ui);
+			run_serial_thread(serial_mode_save);
+		} catch (AltosConfigDataException ae) {
+			JOptionPane.showMessageDialog(owner,
+						      ae.getMessage(),
+						      "Configuration Data Error",
+						      JOptionPane.ERROR_MESSAGE);
+		}
 	}
 
 	public void actionPerformed(ActionEvent e) {
@@ -298,4 +304,4 @@ public class AltosConfig implements ActionListener {
 			}
 		}
 	}
-}
\ No newline at end of file
+}