diff --git a/Model/Player/PlayerModel.swift b/Model/Player/PlayerModel.swift index f2261c7d..51462158 100644 --- a/Model/Player/PlayerModel.swift +++ b/Model/Player/PlayerModel.swift @@ -165,7 +165,9 @@ final class PlayerModel: ObservableObject { } #endif - presentingPlayer = true + DispatchQueue.main.async { [weak self] in + self?.presentingPlayer = true + } #if os(macOS) Windows.player.open() @@ -174,8 +176,10 @@ final class PlayerModel: ObservableObject { } func hide() { - playingFullScreen = false - presentingPlayer = false + DispatchQueue.main.async { [weak self] in + self?.playingFullScreen = false + self?.presentingPlayer = false + } #if os(iOS) if Defaults[.lockPortraitWhenBrowsing] { diff --git a/Shared/Navigation/AppSidebarNavigation.swift b/Shared/Navigation/AppSidebarNavigation.swift index d8e76909..ce8ddee2 100644 --- a/Shared/Navigation/AppSidebarNavigation.swift +++ b/Shared/Navigation/AppSidebarNavigation.swift @@ -49,13 +49,16 @@ struct AppSidebarNavigation: View { .frame(minWidth: sidebarMinWidth) VStack { - HStack(alignment: .center) { - Spacer() - Image(systemName: "4k.tv") - .renderingMode(.original) - .font(.system(size: 60)) - .foregroundColor(.accentColor) - Spacer() + BrowserPlayerControls { + HStack(alignment: .center) { + Spacer() + Image(systemName: "4k.tv") + .renderingMode(.original) + .font(.system(size: 60)) + .foregroundColor(.accentColor) + Spacer() + } + .frame(maxHeight: .infinity) } } }