Fix edge case NPE when the user hits the back button very rapidly dur…

…ing state restoration (#674)
bluelinelabs · Jun 14, 2022 · 5f04d9d · 5f04d9d
1 parent d32fc81
commit 5f04d9d
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/conductor/src/main/java/com/bluelinelabs/conductor/Router.java b/conductor/src/main/java/com/bluelinelabs/conductor/Router.java
@@ -742,6 +742,7 @@ void watchContainerAttach() {
             @Override
             public void run() {
                 containerFullyAttached = true;
+                performPendingControllerChanges();
             }
         });
     }
@@ -861,12 +862,14 @@ private void performControllerChange(@Nullable final Controller to, @Nullable fi
                 to.setNeedsAttach(true);
             }
             pendingControllerChanges.add(transaction);
-            container.post(new Runnable() {
-                @Override
-                public void run() {
-                    performPendingControllerChanges();
-                }
-            });
+            if (container != null) {
+                container.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        performPendingControllerChanges();
+                    }
+                });
+            }
         } else {
             ControllerChangeHandler.executeChange(transaction);
         }