Fix some crashes

(cherry picked from commit 5efb31bd71)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
This commit is contained in:
arkon
2022-10-28 21:10:03 -04:00
committed by Jobobby04
parent 55a07ae51a
commit 38abaa162e
6 changed files with 13 additions and 11 deletions
@@ -94,7 +94,7 @@ fun BrowseSourceScreen(
Column(modifier = Modifier.background(MaterialTheme.colorScheme.surface)) {
BrowseSourceToolbar(
state = presenter,
source = presenter.source!!,
source = presenter.source,
displayMode = presenter.displayMode.takeUnless { presenter.source!!.isEhBasedSource() && presenter.ehentaiBrowseDisplayMode },
onDisplayModeChange = { presenter.displayMode = it },
navigateUp = navigateUp,
@@ -36,7 +36,7 @@ import exh.source.anyIs
@Composable
fun BrowseSourceToolbar(
state: BrowseSourceState,
source: CatalogueSource,
source: CatalogueSource?,
displayMode: LibraryDisplayMode?,
onDisplayModeChange: (LibraryDisplayMode) -> Unit,
navigateUp: () -> Unit,
@@ -50,7 +50,7 @@ fun BrowseSourceToolbar(
) {
if (state.searchQuery == null) {
BrowseSourceRegularToolbar(
title = if (state.isUserQuery) state.currentFilter.query else source.name,
title = if (state.isUserQuery) state.currentFilter.query else source?.name.orEmpty(),
isLocalSource = source is LocalSource,
// SY -->
isConfigurableSource = source.anyIs<ConfigurableSource>(),