Only observe modal result changes if the current Fragment is not a `m…

…odal` context. This works around a race condition bug when popping the backstack and sending the modal result back to a default context.
hotwired · May 3, 2022 · 0a2badd · 0a2badd
1 parent 32feebc
commit 0a2badd
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/turbo/src/main/kotlin/dev/hotwire/turbo/fragments/TurboFragment.kt b/turbo/src/main/kotlin/dev/hotwire/turbo/fragments/TurboFragment.kt
@@ -122,8 +122,8 @@ abstract class TurboFragment : Fragment(), TurboNavDestination {
     }
 
     private fun observeModalResult() {
-        delegate.sessionViewModel.modalResult.observe(viewLifecycleOwner) { event ->
-            if (shouldHandleModalResults()) {
+        if (shouldHandleModalResults()) {
+            delegate.sessionViewModel.modalResult.observe(viewLifecycleOwner) { event ->
                 event.getContentIfNotHandled()?.let {
                     onStartAfterModalResult(it)
                 }