From 2f01f2ab10b9e961d2c611f9b3e0731cb16b762b Mon Sep 17 00:00:00 2001 From: hyb1996 <946994919@qq.com> Date: Sat, 30 Dec 2017 17:35:43 +0800 Subject: [PATCH] fix hyb1996-guest/auto.js3-issues#2 --- .../stardust/scriptdroid/ui/floating/FloatyWindowManger.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/floating/FloatyWindowManger.java b/app/src/main/java/com/stardust/scriptdroid/ui/floating/FloatyWindowManger.java index 874238f6..5fd30cc4 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/floating/FloatyWindowManger.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/floating/FloatyWindowManger.java @@ -51,12 +51,10 @@ public class FloatyWindowManger { } } - public static void closeWindow(FloatyWindow window) { window.close(); } - public static boolean isCircularMenuShowing() { return sCircularMenu != null && sCircularMenu.get() != null; } @@ -76,7 +74,8 @@ public class FloatyWindowManger { if (sCircularMenu == null) return; CircularMenu menu = sCircularMenu.get(); - menu.close(); + if (menu != null) + menu.close(); sCircularMenu = null; } }