X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=telegps%2FTeleGPSConfig.java;h=e607a5a5510f0c52e173ca2fa9756c55d5fd7729;hp=ffb2d6122bc594433047c7ec232ba3610a6a28ba;hb=6cc2d671c0e335fbedb0e97699f8f273502c6807;hpb=a7fd31842a602a8ac803d0e09efb4ffabf7a289b

diff --git a/telegps/TeleGPSConfig.java b/telegps/TeleGPSConfig.java
index ffb2d612..e607a5a5 100644
--- a/telegps/TeleGPSConfig.java
+++ b/telegps/TeleGPSConfig.java
@@ -22,8 +22,8 @@ import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.text.*;
-import org.altusmetrum.altoslib_4.*;
-import org.altusmetrum.altosuilib_2.*;
+import org.altusmetrum.altoslib_5.*;
+import org.altusmetrum.altosuilib_3.*;
 
 public class TeleGPSConfig implements ActionListener {
 
@@ -221,22 +221,28 @@ public class TeleGPSConfig implements ActionListener {
 
 	void save_data() {
 
-		/* bounds check stuff */
-		if (config_ui.flight_log_max() > data.log_limit()) {
+		try {
+			/* bounds check stuff */
+			if (config_ui.flight_log_max() > data.log_space()/1024) {
+				JOptionPane.showMessageDialog(owner,
+							      String.format("Requested flight log, %dk, is larger than the available space, %dk.\n",
+									    config_ui.flight_log_max(),
+									    data.log_space()/1024),
+							      "Maximum Flight Log Too Large",
+							      JOptionPane.ERROR_MESSAGE);
+				return;
+			}
+
+			/* 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);
+		} catch (AltosConfigDataException ae) {
 			JOptionPane.showMessageDialog(owner,
-						      String.format("Requested flight log, %dk, is larger than the available space, %dk.\n",
-								    config_ui.flight_log_max(),
-								    data.log_limit()),
-						      "Maximum Flight Log Too Large",
+						      ae.getMessage(),
+						      "Configuration Data Error",
 						      JOptionPane.ERROR_MESSAGE);
-			return;
 		}
-
-		/* 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);
 	}
 
 	public void actionPerformed(ActionEvent e) {