소스 검색

Check for null

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 7 년 전
부모
커밋
bf71a90b8c
1개의 변경된 파일5개의 추가작업 그리고 5개의 파일을 삭제
  1. 5 5
      app/src/main/java/com/nextcloud/talk/controllers/base/bottomnavigation/BottomNavigationController.java

+ 5 - 5
app/src/main/java/com/nextcloud/talk/controllers/base/bottomnavigation/BottomNavigationController.java

@@ -219,11 +219,11 @@ public abstract class BottomNavigationController extends BaseController {
      * BottomNavigationController#getControllerFor(int)}, using a {@link FadeChangeHandler}.
      */
     protected void resetCurrentBackstack() {
-        lastActiveChildRouter
-                .setRoot(
-                        RouterTransaction.with(this.getControllerFor(currentlySelectedItemId))
-                                .pushChangeHandler(new FadeChangeHandler())
-                                .popChangeHandler(new FadeChangeHandler()));
+        if (lastActiveChildRouter != null) {
+            lastActiveChildRouter.setRoot(RouterTransaction.with(this.getControllerFor(currentlySelectedItemId))
+                                    .pushChangeHandler(new FadeChangeHandler())
+                                    .popChangeHandler(new FadeChangeHandler()));
+        }
     }
 
     /**