From 8ee3464d8064ebe1694c7b20177878c0d9961451 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 9 Sep 2010 17:54:41 -0700 Subject: altosui: Display error dialog when AltOS JNI library can't be loaded Having an error dialog appear at application startup seems better than simply failing to present the device dialog later on. Signed-off-by: Keith Packard --- ao-tools/altosui/AltosDeviceDialog.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'ao-tools/altosui/AltosDeviceDialog.java') 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; } } -- cgit v1.2.3