X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosDeviceDialog.java;h=2966ad1e52bd44a6855d07e47fe3c68bad6bd9b1;hp=3df4c6ebeb15c27e4176dc16ff1560bf5fdbe7b6;hb=8463ffcaca6bcd31e645aba71c171f548dce96d8;hpb=5f2f6a8f9ba56be867888758848bc7f152ccbd47

diff --git a/ao-tools/altosui/AltosDeviceDialog.java b/ao-tools/altosui/AltosDeviceDialog.java
index 3df4c6eb..2966ad1e 100644
--- a/ao-tools/altosui/AltosDeviceDialog.java
+++ b/ao-tools/altosui/AltosDeviceDialog.java
@@ -26,7 +26,6 @@ import libaltosJNI.libaltos;
 import libaltosJNI.altos_device;
 import libaltosJNI.SWIGTYPE_p_altos_file;
 import libaltosJNI.SWIGTYPE_p_altos_list;
-import altosui.AltosDevice;
 
 public class AltosDeviceDialog extends JDialog implements ActionListener {
 
@@ -49,10 +48,15 @@ public class AltosDeviceDialog extends JDialog implements ActionListener {
 			dialog.setVisible(true);
 			return value;
 		} else {
-			JOptionPane.showMessageDialog(frame,
-						      "No AltOS devices available",
-						      "No AltOS devices",
-						      JOptionPane.ERROR_MESSAGE);
+			/* check for missing altos JNI library, which
+			 * will put up its own error dialog
+			 */
+			if (AltosUI.load_library(frame)) {
+				JOptionPane.showMessageDialog(frame,
+							      "No AltOS devices available",
+							      "No AltOS devices",
+							      JOptionPane.ERROR_MESSAGE);
+			}
 			return null;
 		}
 	}