From 4c0d01c961978d46843a1c89a8ef381675f8d9d1 Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Tue, 15 Aug 2017 10:13:25 +0800
Subject: [PATCH] fix: forceStop not working when recorded file is executed in
 loop

---
 .../com/stardust/autojs/engine/RootAutomatorEngine.java   | 1 -
 .../com/stardust/autojs/runtime/api/ProcessShell.java     | 5 ++---
 .../runtime/exception/ScriptInterruptedException.java     | 8 ++++++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/autojs/src/main/java/com/stardust/autojs/engine/RootAutomatorEngine.java b/autojs/src/main/java/com/stardust/autojs/engine/RootAutomatorEngine.java
index 41d78e61..159e7480 100644
--- a/autojs/src/main/java/com/stardust/autojs/engine/RootAutomatorEngine.java
+++ b/autojs/src/main/java/com/stardust/autojs/engine/RootAutomatorEngine.java
@@ -110,6 +110,5 @@ public class RootAutomatorEngine extends ScriptEngine.AbstractScriptEngine<AutoF
     @Override
     public synchronized void destroy() {
         super.destroy();
-        Log.d(LOG_TAG, "Shell exit");
     }
 }
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/ProcessShell.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/ProcessShell.java
index 6ceb6d93..0307099e 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/api/ProcessShell.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/ProcessShell.java
@@ -3,6 +3,7 @@ package com.stardust.autojs.runtime.api;
 
 import android.util.Log;
 
+import com.stardust.autojs.runtime.exception.ScriptInterruptedException;
 import com.stardust.autojs.util.ProcessUtils;
 import com.stardust.pio.UncheckedIOException;
 
@@ -202,9 +203,7 @@ public class ProcessShell extends AbstractShell {
             commandResult.error = readAll(process.getErrorStream());
             Log.d(TAG, commandResult.toString());
         } catch (Exception e) {
-            commandResult.code = -1;
-            commandResult.error = e.getMessage();
-            e.printStackTrace();
+            throw new ScriptInterruptedException(e);
         } finally {
             try {
                 if (os != null) os.close();
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/exception/ScriptInterruptedException.java b/autojs/src/main/java/com/stardust/autojs/runtime/exception/ScriptInterruptedException.java
index 8be2013d..28ef741e 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/exception/ScriptInterruptedException.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/exception/ScriptInterruptedException.java
@@ -6,6 +6,14 @@ package com.stardust.autojs.runtime.exception;
 
 public class ScriptInterruptedException extends ScriptException {
 
+    public ScriptInterruptedException(){
+
+    }
+
+    public ScriptInterruptedException(Throwable e) {
+        super(e);
+    }
+
     public static boolean causedByInterrupted(Throwable e) {
         return e instanceof ScriptInterruptedException || e.getCause() instanceof ScriptInterruptedException;
     }