mirror of
https://github.com/jellyfin/jellyfin-androidtv.git
synced 2025-05-17 19:36:03 +08:00
Fix crash on startup (#4640)
* Fix crash on startup * Changed condition evaluation order
This commit is contained in:
@ -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 {
|
||||||
|
Reference in New Issue
Block a user