fix: viewModelScope keeping some a coroutine alive after PlayerActivi…

…ty is destroyed oh and also fix crash when exiting the player
abdallahmehiz · Nov 9, 2024 · 1d0c998 · 1d0c998
1 parent c1e5a8b
commit 1d0c998
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/app/src/main/java/live/mehiz/mpvkt/ui/player/PlayerActivity.kt b/app/src/main/java/live/mehiz/mpvkt/ui/player/PlayerActivity.kt
@@ -485,6 +485,7 @@ class PlayerActivity : AppCompatActivity() {
   }
 
   internal fun event(eventId: Int) {
+    if (player.isExiting) return
     when (eventId) {
       MPVLib.mpvEventId.MPV_EVENT_FILE_LOADED -> {
         fileName = getFileName(intent)

diff --git a/app/src/main/java/live/mehiz/mpvkt/ui/player/PlayerViewModel.kt b/app/src/main/java/live/mehiz/mpvkt/ui/player/PlayerViewModel.kt
@@ -15,6 +15,7 @@ import dev.vivvvek.seeker.Segment
 import `is`.xyz.mpv.MPVLib
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -542,6 +543,11 @@ class PlayerViewModel(
 
     MPVLib.command(arrayOf("load-script", tempFile.absolutePath))
   }
+
+  override fun onCleared() {
+    super.onCleared()
+    viewModelScope.cancel()
+  }
 }
 
 data class Track(