MusicMode: don't bindPlayerToLayer when entering foreground

fixes yattee#617
stonerl · Apr 25, 2024 · c153b80 · c153b80
1 parent d1cf45c
commit c153b80
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/Model/Player/PlayerModel.swift b/Model/Player/PlayerModel.swift
@@ -176,7 +176,7 @@ final class PlayerModel: ObservableObject {
     @Default(.resetWatchedStatusOnPlaying) var resetWatchedStatusOnPlaying
     @Default(.playerRate) var playerRate
     @Default(.systemControlsSeekDuration) var systemControlsSeekDuration
-    
+
     #if os(macOS)
         @Default(.buttonBackwardSeekDuration) private var buttonBackwardSeekDuration
         @Default(.buttonForwardSeekDuration) private var buttonForwardSeekDuration
@@ -192,7 +192,7 @@ final class PlayerModel: ObservableObject {
     var onPlayStream = [(Stream) -> Void]()
     var rateToRestore: Float?
     private var remoteCommandCenterConfigured = false
-    
+
     #if os(macOS)
         var keyPressMonitor: Any?
     #endif
@@ -935,7 +935,10 @@ final class PlayerModel: ObservableObject {
     #else
         func handleEnterForeground() {
             setNeedsDrawing(presentingPlayer)
-            avPlayerBackend.bindPlayerToLayer()
+
+            if !musicMode, playingInPictureInPicture {
+                avPlayerBackend.bindPlayerToLayer()
+            }
 
             guard closePiPAndOpenPlayerOnEnteringForeground, playingInPictureInPicture else {
                 return
@@ -1158,7 +1161,7 @@ final class PlayerModel: ObservableObject {
 
         return nil
     }
-    
+
     #if os(macOS)
         private func assignKeyPressMonitor() {
             keyPressMonitor = NSEvent.addLocalMonitorForEvents(matching: .keyDown) { keyEvent -> NSEvent? in
@@ -1193,7 +1196,7 @@ final class PlayerModel: ObservableObject {
                 return nil
             }
         }
-        
+
         private func destroyKeyPressMonitor() {
             if let keyPressMonitor = keyPressMonitor {
                 NSEvent.removeMonitor(keyPressMonitor)