From 505bf2c8cd8b4713979aca9a1dac2cf9f2c4123b Mon Sep 17 00:00:00 2001 From: Isaac Udy Date: Tue, 24 Jan 2023 02:58:30 +1300 Subject: [PATCH] Attempt to fix tests failing on slow emulator --- .../core/compose/container/ComposableNavigationContainer.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/enro-core/src/main/java/dev/enro/core/compose/container/ComposableNavigationContainer.kt b/enro-core/src/main/java/dev/enro/core/compose/container/ComposableNavigationContainer.kt index 5681861c..26f40144 100644 --- a/enro-core/src/main/java/dev/enro/core/compose/container/ComposableNavigationContainer.kt +++ b/enro-core/src/main/java/dev/enro/core/compose/container/ComposableNavigationContainer.kt @@ -172,9 +172,9 @@ public class ComposableNavigationContainer internal constructor( else -> activeContext } ?: parentContext - val isRestoredFromExitingParent = when { - parentContext is FragmentContext<*> && parentContext.contextReference.isDetached -> return - parentContext.contextReference is NavigationHost -> parentContext.parentContainer()?.backstackState?.exiting != null + runCatching { parentContext.parentContext }.onFailure { return } + val isRestoredFromExitingParent = when (parentContext.contextReference) { + is NavigationHost -> parentContext.parentContainer()?.backstackState?.exiting != null else -> false }