fix hyb1996-guest/auto.js3-issues#2

2017-12-30 17:35:43 +08:00
parent efb3054084
commit 2f01f2ab10
1 changed files with 2 additions and 3 deletions
--- 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;
    }
 }