From 1680fe0d525c63ea36a6593a41c32c5c4ecd12d8 Mon Sep 17 00:00:00 2001
From: jdf <jdf@pobox.com>
Date: Fri, 5 Mar 2010 17:49:07 +0000
Subject: [PATCH] Always cancel futures that don't yield results.

---
 .../tool/src/processing/app/tools/android/AndroidTool.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/android/tool/src/processing/app/tools/android/AndroidTool.java b/android/tool/src/processing/app/tools/android/AndroidTool.java
index b611cb5cb..907200294 100644
--- a/android/tool/src/processing/app/tools/android/AndroidTool.java
+++ b/android/tool/src/processing/app/tools/android/AndroidTool.java
@@ -161,6 +161,7 @@ public class AndroidTool implements Tool, DeviceListener {
       throws Cancelled {
     for (int i = 0; i < 120; i++) {
       if (monitor.isCanceled()) {
+        deviceFuture.cancel(true);
         throw new Cancelled();
       }
       try {
@@ -279,6 +280,7 @@ public class AndroidTool implements Tool, DeviceListener {
 
   public void sketchStopped() {
     editor.internalRunnerClosed();
+    editor.statusEmpty();
   }
 
   /**
@@ -290,6 +292,7 @@ public class AndroidTool implements Tool, DeviceListener {
       try {
         runSketchOnDevice(AndroidEnvironment.getInstance().getEmulator());
       } catch (final Cancelled ok) {
+        sketchStopped();
         editor.statusNotice("Cancelled.");
       }
     }
@@ -303,6 +306,7 @@ public class AndroidTool implements Tool, DeviceListener {
       try {
         runSketchOnDevice(AndroidEnvironment.getInstance().getHardware());
       } catch (final Cancelled ok) {
+        sketchStopped();
         editor.statusNotice("Cancelled.");
       }
     }
@@ -336,4 +340,5 @@ public class AndroidTool implements Tool, DeviceListener {
   @SuppressWarnings("serial")
   private static class Cancelled extends Exception {
   }
+
 }
\ No newline at end of file