From: Keith Packard <keithp@keithp.com>
Date: Tue, 24 Aug 2010 10:59:09 +0000 (-0700)
Subject: altosui: Delay mapping Flash UI until flashing actually starts
X-Git-Tag: debian/0.6+373+gcf65c6b~21
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=d93787284c8e514a929edb9f944c98ae0206a33f;ds=sidebyside

altosui: Delay mapping Flash UI until flashing actually starts

The flash operation may be abandoned before it even starts; this makes
sure the UI doesn't flash up on the screen.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/ao-tools/altosui/AltosFlash.java b/ao-tools/altosui/AltosFlash.java
index 0f92d6e7..7aeab89a 100644
--- a/ao-tools/altosui/AltosFlash.java
+++ b/ao-tools/altosui/AltosFlash.java
@@ -247,6 +247,7 @@ public class AltosFlash {
 		int flash_addr = image.address;
 		int image_start = 0;
 
+		action("start", 0);
 		action(0, image.data.length);
 		while (remain > 0 && !aborted) {
 			int this_time = remain;
diff --git a/ao-tools/altosui/AltosFlashUI.java b/ao-tools/altosui/AltosFlashUI.java
index 0c2041e3..b88a16b3 100644
--- a/ao-tools/altosui/AltosFlashUI.java
+++ b/ao-tools/altosui/AltosFlashUI.java
@@ -57,8 +57,10 @@ public class AltosFlashUI
 		} else {
 			String	cmd = e.getActionCommand();
 			if (cmd.equals("done"))
-				dispose();
-			else {
+				;
+			else if (cmd.equals("start")) {
+				setVisible(true);
+			} else {
 				pbar.setValue(e.getID());
 				pbar.setString(cmd);
 			}
@@ -88,15 +90,14 @@ public class AltosFlashUI
 						      "Cannot open image",
 						      file.toString(),
 						      JOptionPane.ERROR_MESSAGE);
-			return;
 		} catch (IOException e) {
 			JOptionPane.showMessageDialog(frame,
 						      e.getMessage(),
 						      file.toString(),
 						      JOptionPane.ERROR_MESSAGE);
-			return;
 		} catch (InterruptedException ie) {
 		}
+		dispose();
 	}
 
 	public void abort() {