X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosFlashUI.java;h=0302ccd38d9231fd25e8166d2547422efe5c1d01;hp=0b61f041f16cb0dd7fa03800d2482804c1d06816;hb=b8f05cdc0e9b4a96852eed9d38ff6d5950e2d2ed;hpb=adbb14c63d85b7a54223f88ac623571456f4a462

diff --git a/altosui/AltosFlashUI.java b/altosui/AltosFlashUI.java
index 0b61f041..0302ccd3 100644
--- a/altosui/AltosFlashUI.java
+++ b/altosui/AltosFlashUI.java
@@ -49,13 +49,21 @@ public class AltosFlashUI
 
 	public void actionPerformed(ActionEvent e) {
 		if (e.getSource() == cancel) {
-			abort();
+			setVisible(false);
 			dispose();
 		} else {
 			String	cmd = e.getActionCommand();
-			if (cmd.equals("done"))
-				;
-			else if (cmd.equals("start")) {
+			if (e.getID() == -1) {
+				JOptionPane.showMessageDialog(frame,
+							      e.getActionCommand(),
+							      file.toString(),
+							      JOptionPane.ERROR_MESSAGE);
+				setVisible(false);
+				dispose();
+			} else if (cmd.equals("done")) {
+				setVisible(false);
+				dispose();
+			} else if (cmd.equals("start")) {
 				setVisible(true);
 			} else {
 				pbar.setValue(e.getID());
@@ -64,11 +72,6 @@ public class AltosFlashUI
 		}
 	}
 
-	public void abort() {
-		if (flash != null)
-			flash.abort();
-	}
-
 	public void build_dialog() {
 		GridBagConstraints c;
 		Insets il = new Insets(4,4,4,4);
@@ -186,7 +189,6 @@ public class AltosFlashUI
 				file_value.setText(file.toString());
 				setVisible(true);
 				flash.flash();
-				flash = null;
 			}
 		} catch (FileNotFoundException ee) {
 			JOptionPane.showMessageDialog(frame,
@@ -205,9 +207,6 @@ public class AltosFlashUI
 						      file.toString(),
 						      JOptionPane.ERROR_MESSAGE);
 		} catch (InterruptedException ie) {
-		} finally {
-			abort();
 		}
-		dispose();
 	}
 }
\ No newline at end of file