macOS: Detach AVPlayer listeners before calling setPlayer

juce-framework · Nov 30, 2021 · fd7e4af · fd7e4af
1 parent 4646689
commit fd7e4af
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/modules/juce_video/native/juce_mac_Video.h b/modules/juce_video/native/juce_mac_Video.h
@@ -487,13 +487,13 @@ struct VideoComponent::Pimpl   : public Base
         {
             if (crtp().getPlayer() != nullptr && playerStatusObserver != nullptr)
             {
-                    [crtp().getPlayer() removeObserver: playerStatusObserver.get()
-                                            forKeyPath: nsStringLiteral ("rate")
-                                               context: this];
+                [crtp().getPlayer() removeObserver: playerStatusObserver.get()
+                                        forKeyPath: nsStringLiteral ("rate")
+                                           context: this];
 
-                    [crtp().getPlayer() removeObserver: playerStatusObserver.get()
-                                            forKeyPath: nsStringLiteral ("status")
-                                               context: this];
+                [crtp().getPlayer() removeObserver: playerStatusObserver.get()
+                                        forKeyPath: nsStringLiteral ("status")
+                                           context: this];
             }
         }
 
@@ -626,6 +626,9 @@ struct VideoComponent::Pimpl   : public Base
 
         void setPlayer (AVPlayer* player)
         {
+            detachPlayerStatusObserver();
+            detachPlaybackObserver();
+
            #if ! JUCE_32BIT
             if (useNativeControls)
                 [playerView setPlayer: player];
@@ -638,11 +641,6 @@ struct VideoComponent::Pimpl   : public Base
                 attachPlayerStatusObserver();
                 attachPlaybackObserver();
             }
-            else
-            {
-                detachPlayerStatusObserver();
-                detachPlaybackObserver();
-            }
         }
 
         AVPlayer* getPlayer() const