Fixes #568: Crash on custom tabs menu if no other tabs are open

5 years ago · 66ebb652a6
parent b42a512b87
commit 66ebb652a6
1 changed files with 4 additions and 1 deletions
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt
@ -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) },