Fix #8517: Fix crash on launch due to active window changes (#8534)

- Fix crash on active window during fresh install.
brave · Dec 7, 2023 · f766540 · f766540
1 parent c76fa33
commit f766540
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/App/iOS/Delegates/SceneDelegate.swift b/App/iOS/Delegates/SceneDelegate.swift
@@ -533,12 +533,15 @@ extension SceneDelegate {
     let activeWindow = SessionWindow.getActiveWindow(context: DataController.swiftUIContext)
     let activeSession = UIApplication.shared.openSessions
       .compactMap({ BrowserState.getWindowInfo(from: $0) })
-      .first(where: { $0.windowId == activeWindow?.windowId.uuidString })
+      .first(where: { $0.windowId != nil && $0.windowId == activeWindow?.windowId.uuidString })
 
     if activeSession != nil {
       if !UIApplication.shared.supportsMultipleScenes {
         // iPhones should not create new windows
-        return (activeWindow!.windowId, false, nil)
+        if let activeWindow = activeWindow {
+          // If there's no active window, fall through and create one
+          return (activeWindow.windowId, false, nil)
+        }
       }
 
       // An existing window is already active on screen