Fixes #568: Crash on custom tabs menu if no other tabs are open
parent
b42a512b87
commit
66ebb652a6
|
@ -66,11 +66,14 @@ class ToolbarUIView(
|
||||||
}
|
}
|
||||||
|
|
||||||
with(view.context) {
|
with(view.context) {
|
||||||
|
val session = sessionId?.let { components.core.sessionManager.findSessionById(sessionId) }
|
||||||
|
?: components.core.sessionManager.selectedSession
|
||||||
|
|
||||||
toolbarIntegration = ToolbarIntegration(
|
toolbarIntegration = ToolbarIntegration(
|
||||||
this,
|
this,
|
||||||
view,
|
view,
|
||||||
ToolbarMenu(this,
|
ToolbarMenu(this,
|
||||||
requestDesktopStateProvider = { components.core.sessionManager.selectedSessionOrThrow.desktopMode },
|
requestDesktopStateProvider = { session?.desktopMode ?: false },
|
||||||
onItemTapped = { actionEmitter.onNext(SearchAction.ToolbarMenuItemTapped(it)) }
|
onItemTapped = { actionEmitter.onNext(SearchAction.ToolbarMenuItemTapped(it)) }
|
||||||
),
|
),
|
||||||
ShippedDomainsProvider().also { it.initialize(this) },
|
ShippedDomainsProvider().also { it.initialize(this) },
|
||||||
|
|
Loading…
Reference in New Issue