From 32e07c6951a28cf1e7f38af8906df90bf15a1cce Mon Sep 17 00:00:00 2001 From: hyb1996 <946994919@qq.com> Date: Sun, 9 Jul 2017 08:32:54 +0800 Subject: [PATCH] fix hyb1996-guest/AutoJsIssueReport#5141 --- .../com/stardust/scriptdroid/ui/main/SideMenuFragment.java | 3 +++ .../com/stardust/autojs/execution/ScriptExecuteActivity.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/SideMenuFragment.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/SideMenuFragment.java index 3d257f3f..0991db51 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/main/SideMenuFragment.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/SideMenuFragment.java @@ -85,6 +85,9 @@ public class SideMenuFragment extends android.support.v4.app.Fragment { mAccessibilityServiceSwitch.post(new Runnable() { @Override public void run() { + if (mAccessibilityServiceSwitch == null) { + return; + } mAccessibilityServiceSwitch.setChecked(checked); } }); diff --git a/autojs/src/main/java/com/stardust/autojs/execution/ScriptExecuteActivity.java b/autojs/src/main/java/com/stardust/autojs/execution/ScriptExecuteActivity.java index 2f83c081..7ae23709 100644 --- a/autojs/src/main/java/com/stardust/autojs/execution/ScriptExecuteActivity.java +++ b/autojs/src/main/java/com/stardust/autojs/execution/ScriptExecuteActivity.java @@ -40,6 +40,10 @@ public class ScriptExecuteActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + if (execution == null) { + finish(); + return; + } mScriptSource = execution.getSource(); mScriptEngine = execution.getEngine(); mExecutionListener = execution.getListener();