Fix #8013: Fix Playlist Crash on iPad due to invalid Scene (#8162)

brave · Sep 27, 2023 · 7c3861f · 7c3861f
1 parent 63750cf
commit 7c3861f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Sources/Brave/Frontend/Browser/Playlist/Controllers/PlaylistListViewController.swift b/Sources/Brave/Frontend/Browser/Playlist/Controllers/PlaylistListViewController.swift
@@ -704,7 +704,7 @@ extension PlaylistListViewController {
           }
         }
 
-        let items = try await PlaylistSharedFolderNetwork.fetchMediaItemInfo(item: model, viewForInvisibleWebView: self.view)
+        let items = try await PlaylistSharedFolderNetwork.fetchMediaItemInfo(item: model, viewForInvisibleWebView: self.playerView.window ?? self.playerView.superview ?? self.playerView)
         try Task.checkCancellation()
 
         try folder.playlistItems?.forEach({ playlistItem in

diff --git a/Sources/Brave/Frontend/Browser/Playlist/Managers & Cache/PlaylistCacheLoader.swift b/Sources/Brave/Frontend/Browser/Playlist/Managers & Cache/PlaylistCacheLoader.swift
@@ -340,7 +340,7 @@ class PlaylistWebLoader: UIView {
 
       guard let webView = tab.webView,
             let browserViewController = self.currentScene?.browserViewController else {
-        continuation.resume(returning: nil)
+        self.handler?(nil)
         return
       }