Merge pull request #3825 from CruGlobal/GT-2197-Fix-changing-language…

…s-in-cyoa-tool GT-2197 Fix CYOA tools closing when changing languages
CruGlobal · Dec 18, 2024 · 578a82d · 578a82d
2 parents ccea724 + 367a601
commit 578a82d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ui/cyoa-renderer/src/main/kotlin/org/cru/godtools/tool/cyoa/ui/CyoaPageFragment.kt b/ui/cyoa-renderer/src/main/kotlin/org/cru/godtools/tool/cyoa/ui/CyoaPageFragment.kt
@@ -5,8 +5,8 @@ import androidx.annotation.LayoutRes
 import androidx.databinding.ViewDataBinding
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.asLiveData
-import androidx.lifecycle.map
 import javax.inject.Inject
+import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.map
 import org.ccci.gto.android.common.androidx.fragment.app.findListener
 import org.ccci.gto.android.common.androidx.lifecycle.notNull
@@ -62,7 +62,7 @@ abstract class CyoaPageFragment<B : ViewDataBinding, C : BaseController<*>>(@Lay
     // region Page
     internal var pageId by arg<String>()
         private set
-    internal val page by lazy { dataModel.manifest.map { it?.findPage(pageId) }.asLiveData() }
+    internal val page by lazy { dataModel.manifest.filterNotNull().map { it.findPage(pageId) }.asLiveData() }
 
     init {
         page?.let { pageId = page }