X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosConfig.java;h=07802247c9e0d824d020f5b1e83b8eaa8ee0eb66;hp=2cf69525fea1e468d5ab40a502b224d9c64530bd;hb=fd738d47bbc46d36698350d5450abe1125d990a3;hpb=ace5f42b5567cff07a61b622171ac364ea8c165d

diff --git a/altosui/AltosConfig.java b/altosui/AltosConfig.java
index 2cf69525..07802247 100644
--- a/altosui/AltosConfig.java
+++ b/altosui/AltosConfig.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,8 +23,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_11.*;
+import org.altusmetrum.altosuilib_11.*;
 
 public class AltosConfig implements ActionListener {
 
@@ -229,20 +230,20 @@ public class AltosConfig implements ActionListener {
 
 	void save_data() {
 
-		/* bounds check stuff */
-		if (config_ui.flight_log_max() > data.log_limit()) {
-			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",
-						      JOptionPane.ERROR_MESSAGE);
-			return;
-		}
+		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 */
+			/* Pull data out of the UI and stuff back into our local data record */
 
-		try {
 			data.get_values(config_ui);
 			run_serial_thread(serial_mode_save);
 		} catch (AltosConfigDataException ae) {