app/src/main/java/org/mosad/teapod/ui/activity/player/fragment/EpisodeListDialogFragment.kt

@@ -51,8 +51,8 @@ class EpisodeListDialogFragment : DialogFragment()  {
             EpisodeItemAdapter.ViewType.PLAYER
         )
 
-        // episodeNumber starts at 1, we need the episode index -> - 1
-        adapterRecEpisodes.currentSelected = model.currentEpisode.episodeNumber?.minus(1) ?: 0
+        // get the position/index of the currently playing episode
+        adapterRecEpisodes.currentSelected = model.episodes.items.indexOfFirst { it.id == model.currentEpisode.id }
 
         binding.recyclerEpisodesPlayer.adapter = adapterRecEpisodes
         binding.recyclerEpisodesPlayer.scrollToPosition(adapterRecEpisodes.currentSelected)