From 542d2ef88435b749f3ec00622446c7d6c1b626bd Mon Sep 17 00:00:00 2001 From: Floens Date: Sun, 29 Apr 2018 20:15:42 +0200 Subject: [PATCH] drawer: make getTopThreadController return null if not found. Fixes a common crash that I can't trace back right now. --- .../org/floens/chan/ui/controller/DrawerController.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/DrawerController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/DrawerController.java index ebbb16a6..c0758194 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/DrawerController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/DrawerController.java @@ -143,7 +143,9 @@ public class DrawerController extends Controller implements DrawerAdapter.Callba drawerLayout.post(() -> drawerLayout.post(() -> drawerLayout.closeDrawer(drawer))); ThreadController threadController = getTopThreadController(); - threadController.openPin(pin); + if (threadController != null) { + threadController.openPin(pin); + } } @Override @@ -300,7 +302,8 @@ public class DrawerController extends Controller implements DrawerAdapter.Callba return (ThreadController) slideNav.leftController; } } - throw new IllegalStateException(); + + return null; } private ToolbarNavigationController getMainToolbarNavigationController() {