From 487f6ea03a1b22732acc18650960ed862959b5e4 Mon Sep 17 00:00:00 2001
From: LagradOst <balt.758@gmail.com>
Date: Sun, 9 Jan 2022 00:59:50 +0100
Subject: [PATCH] fixed +50 episodes selection

---
 .../cloudstream3/ui/result/ResultFragment.kt   | 18 ++++++++----------
 .../cloudstream3/ui/result/ResultViewModel.kt  | 13 +++++++------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
index 1ee00670..0d7049fe 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
@@ -833,17 +833,15 @@ class ResultFragment : Fragment() {
                 }
 
                 ACTION_PLAY_EPISODE_IN_PLAYER -> {
-                    currentEpisodes?.let { episodes ->
-                        viewModel.getGenerator(episodes.indexOf(episodeClick.data))
-                            ?.let { generator ->
-                                activity?.navigate(
-                                    R.id.global_to_navigation_player,
-                                    GeneratorPlayer.newInstance(
-                                        generator
-                                    )
+                    viewModel.getGenerator(episodeClick.data)
+                        ?.let { generator ->
+                            activity?.navigate(
+                                R.id.global_to_navigation_player,
+                                GeneratorPlayer.newInstance(
+                                    generator
                                 )
-                            }
-                    }
+                            )
+                        }
                 }
 
                 ACTION_RELOAD_EPISODE -> {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel.kt
index 243c47cd..9a0f20cd 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel.kt
@@ -190,11 +190,10 @@ class ResultViewModel : ViewModel() {
     }
 
     fun changeDubStatus(status: DubStatus?) {
+        if(status == null) return
         dubSubEpisodes.value?.get(status)?.let { episodes ->
             id.value?.let {
-                if (status != null) {
-                    setDub(it, status)
-                }
+                setDub(it, status)
             }
             _dubStatus.postValue(status)
             updateEpisodes(null, episodes, null)
@@ -207,7 +206,7 @@ class ResultViewModel : ViewModel() {
         clearCache: Boolean = false
     ): Resource<Pair<Set<ExtractorLink>, Set<SubtitleData>>> {
         return safeApiCall {
-            val index = _episodes.value?.indexOf(episode) ?: throw Exception("invalid Index")
+            val index = _episodes.value?.indexOf(episode) ?: episode.index
 
             val currentLinks = mutableSetOf<ExtractorLink>()
             val currentSubs = mutableSetOf<SubtitleData>()
@@ -225,8 +224,10 @@ class ResultViewModel : ViewModel() {
         }
     }
 
-    fun getGenerator(episodeIndex: Int): IGenerator? {
-        generator?.goto(episodeIndex)
+    fun getGenerator(episode: ResultEpisode): IGenerator? {
+        val index = _episodes.value?.indexOf(episode) ?: episode.index
+
+        generator?.goto(index)
         return generator
     }