diff --git a/navigation-cicerone/src/main/java/ru/touchin/roboswag/navigation_cicerone/flow/FlowFragment.kt b/navigation-cicerone/src/main/java/ru/touchin/roboswag/navigation_cicerone/flow/FlowFragment.kt index 9849a3a..d646c9d 100644 --- a/navigation-cicerone/src/main/java/ru/touchin/roboswag/navigation_cicerone/flow/FlowFragment.kt +++ b/navigation-cicerone/src/main/java/ru/touchin/roboswag/navigation_cicerone/flow/FlowFragment.kt @@ -59,7 +59,11 @@ abstract class FlowFragment : Fragment(R.layout.fragment_flow) { private val exitRouterOnBackPressed = object : OnBackPressedCallback(true) { override fun handleOnBackPressed() { - router.exit() + if (childFragmentManager.backStackEntryCount == 0 && parentFragmentManager.backStackEntryCount != 0) { + parentFragmentManager.popBackStack() + } else { + router.exit() + } } }