Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

1 files changed, 9 insertions, 4 deletions

diff --git a/ao-tools/altosui/AltosDeviceDialog.java b/ao-tools/altosui/AltosDeviceDialog.java
index 3df4c6eb..ec78e288 100644
--- a/ao-tools/altosui/AltosDeviceDialog.java
+++ b/ao-tools/altosui/AltosDeviceDialog.java
@@ -49,10 +49,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;
 		}
 	}