Fix crash on startup (#4640)

* Fix crash on startup

* Changed condition evaluation order
This commit is contained in:
Florian Dreier
2025-05-10 17:29:12 +02:00
committed by GitHub
parent aaf26ec4bf
commit a78db2701a

View File

@ -16,6 +16,7 @@ import androidx.fragment.app.FragmentManager
import androidx.fragment.app.FragmentTransaction import androidx.fragment.app.FragmentTransaction
import org.jellyfin.androidtv.R import org.jellyfin.androidtv.R
import org.jellyfin.androidtv.ui.navigation.NavigationAction import org.jellyfin.androidtv.ui.navigation.NavigationAction
import timber.log.Timber
import java.util.Stack import java.util.Stack
private class HistoryEntry( private class HistoryEntry(
@ -154,9 +155,13 @@ class DestinationFragmentView @JvmOverloads constructor(
else add(container.id, fragment, FRAGMENT_TAG_CONTENT) else add(container.id, fragment, FRAGMENT_TAG_CONTENT)
} }
// Commit if (fragmentManager.isDestroyed) {
if (fragmentManager.isStateSaved) transaction.commitNowAllowingStateLoss() Timber.w("FragmentManager is already destroyed")
else transaction.commitNow() } else if (fragmentManager.isStateSaved) {
transaction.commitAllowingStateLoss()
} else {
transaction.commit()
}
} }
override fun onSaveInstanceState(): Parcelable { override fun onSaveInstanceState(): Parcelable {