diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java b/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java index 6a02650..903e3a7 100644 --- a/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java +++ b/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java @@ -54,7 +54,7 @@ public class ViewController isDestroyed = BehaviorSubject.create(false); + private final BehaviorSubject isDestroyedSubject = BehaviorSubject.create(false); public ViewController(@NonNull final CreationContext creationContext, @Nullable final Bundle savedInstanceState) { @@ -69,6 +69,10 @@ public class ViewController isDestroyed).first()); + .takeUntil(isDestroyedSubject.filter(isDestroyed -> isDestroyed).first()); } /** @@ -163,7 +167,7 @@ public class ViewController(new FrameLayout(view.getContext()), savedInstanceState)); - viewControllerSubscription = viewControllerObservable.subscribe(this::onViewControllerChanged, Lc::assertion); } @Override @@ -212,8 +213,6 @@ public abstract class ViewControllerFragment