From dd95e66e16dafb1fc5746f77c52df51dccac8d4a Mon Sep 17 00:00:00 2001
From: Francesco <100066266+cranci1@users.noreply.github.com>
Date: Thu, 17 Apr 2025 11:27:05 +0200
Subject: [PATCH] lmao my bad

---
 .../CustomPlayer/CustomPlayer.swift           | 24 ++++---------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/Sora/Utils/MediaPlayer/CustomPlayer/CustomPlayer.swift b/Sora/Utils/MediaPlayer/CustomPlayer/CustomPlayer.swift
index 30b8552..08fcf00 100644
--- a/Sora/Utils/MediaPlayer/CustomPlayer/CustomPlayer.swift
+++ b/Sora/Utils/MediaPlayer/CustomPlayer/CustomPlayer.swift
@@ -301,38 +301,24 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
         skip85Button?.isHidden = !isSkip85Visible
     }
     
-    override func viewDidDisappear(_ animated: Bool) {
-        super.viewDidDisappear(animated)
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
         if let playbackSpeed = player?.rate {
             UserDefaults.standard.set(playbackSpeed, forKey: "lastPlaybackSpeed")
         }
-        player?.pause()
-        if let timeObserverToken = timeObserverToken {
-            player?.removeTimeObserver(timeObserverToken)
-            self.timeObserverToken = nil
-        }
-    }
-    
-    override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
-        
-        loadedTimeRangesObservation?.invalidate()
-        loadedTimeRangesObservation = nil
         
         if let token = timeObserverToken {
             player.removeTimeObserver(token)
             timeObserverToken = nil
         }
         
+        loadedTimeRangesObservation?.invalidate()
+        loadedTimeRangesObservation = nil
+        
         updateTimer?.invalidate()
         inactivityTimer?.invalidate()
         
         player.pause()
-        
-        if let playbackSpeed = player?.rate {
-            UserDefaults.standard.set(playbackSpeed, forKey: "lastPlaybackSpeed")
-        }
-        
     }
     
     override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {