Fix crash in VideoView.requestEdrMode while quitting, #4328 (#4329)

low-batt · web-flow · commit aafa2db94683 · 2023-04-11T09:27:56.000+09:00
This commit will:
- Add a new isStopping property to PlayerCore
- Change PlayerCore.trackListChanged to do nothing if the player is
  stopping or shutting down
- Change PlayerCore.refreshEdrMode to do nothing if the player is
  stopping or shutting down
diff --git a/iina/PlayerCore.swift b/iina/PlayerCore.swift
@@ -156,6 +156,9 @@ class PlayerCore: NSObject {
   /// Whether shutdown of this player has completed (mpv has shutdown).
   var isShutdown = false
 
+  /// Whether stopping of this player has been initiated.
+  var isStopping = false
+
   /// Whether mpv playback has stopped and the media has been unloaded.
   var isStopped = true
 
@@ -660,6 +663,7 @@ class PlayerCore: NSObject {
     // initiated directly through mpv.
     guard !isStopped else { return }
     Logger.log("Stopping playback", subsystem: subsystem)
+    isStopping = true
     mpv.command(.stop)
   }
 
@@ -670,6 +674,7 @@ class PlayerCore: NSObject {
   func playbackStopped() {
     Logger.log("Playback has stopped", subsystem: subsystem)
     isStopped = true
+    isStopping = false
     postNotification(.iinaPlayerStopped)
   }
 
@@ -1481,6 +1486,7 @@ class PlayerCore: NSObject {
     triedUsingExactSeekForCurrentFile = false
     info.fileLoading = false
     info.haveDownloadedSub = false
+    isStopping = false
     isStopped = false
     checkUnsyncedWindowOptions()
     // generate thumbnails if window has loaded video
@@ -1546,8 +1552,10 @@ class PlayerCore: NSObject {
   }
 
   func trackListChanged() {
-    // Must not process track list changes if mpv is terminating.
-    guard !isShuttingDown else { return }
+    // No need to process track list changes if playback is being stopped. Must not process track
+    // list changes if mpv is terminating as accessing mpv once shutdown has been initiated can
+    // trigger a crash.
+    guard !isStopping, !isStopped, !isShuttingDown else { return }
     Logger.log("Track list changed", subsystem: subsystem)
     getTrackInfo()
     getSelectedTracks()
@@ -1578,7 +1586,9 @@ class PlayerCore: NSObject {
   func refreshEdrMode() {
     guard mainWindow.loaded else { return }
     DispatchQueue.main.async {
-      guard !self.isStopped else { return }
+      // No need to refresh if playback is being stopped. Must not attempt to refresh if mpv is
+      // terminating as accessing mpv once shutdown has been initiated can trigger a crash.
+      guard !self.isStopping, !self.isStopped, !self.isShuttingDown else { return }
       self.mainWindow.videoView.refreshEdrMode()
     }
   }
