[fenix] Fixes https://github.com/mozilla-mobile/fenix/issues/568: Crash on custom tabs menu if no other tabs are open

pull/600/head
Colin Lee 6 years ago committed by Jeff Boek
parent 36e09d14fb
commit 9b1c5ef4d5

@ -66,11 +66,14 @@ class ToolbarUIView(
}
with(view.context) {
val session = sessionId?.let { components.core.sessionManager.findSessionById(sessionId) }
?: components.core.sessionManager.selectedSession
toolbarIntegration = ToolbarIntegration(
this,
view,
ToolbarMenu(this,
requestDesktopStateProvider = { components.core.sessionManager.selectedSessionOrThrow.desktopMode },
requestDesktopStateProvider = { session?.desktopMode ?: false },
onItemTapped = { actionEmitter.onNext(SearchAction.ToolbarMenuItemTapped(it)) }
),
ShippedDomainsProvider().also { it.initialize(this) },

Loading…
Cancel
Save