From 69c9666d2b312af07083b2cc29ffcd2c6d37abb3 Mon Sep 17 00:00:00 2001 From: Jannik Date: Fri, 22 Apr 2022 23:51:51 +0200 Subject: [PATCH] fix crash if media is present in metadb, but season/episode are not present --- .../org/mosad/teapod/ui/activity/player/PlayerViewModel.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/mosad/teapod/ui/activity/player/PlayerViewModel.kt b/app/src/main/java/org/mosad/teapod/ui/activity/player/PlayerViewModel.kt index bf85840..0274293 100644 --- a/app/src/main/java/org/mosad/teapod/ui/activity/player/PlayerViewModel.kt +++ b/app/src/main/java/org/mosad/teapod/ui/activity/player/PlayerViewModel.kt @@ -168,11 +168,12 @@ class PlayerViewModel(application: Application) : AndroidViewModel(application) episode.id == episodeId } ?: NoneEpisode + // TODO improve handling of none present seasons/episodes // update current episode meta currentEpisodeMeta = if (mediaMeta is TVShowMeta && currentEpisode.episodeNumber != null) { (mediaMeta as TVShowMeta) - .seasons[currentEpisode.seasonNumber - 1] - .episodes[currentEpisode.episodeNumber!! - 1] + .seasons.getOrNull(currentEpisode.seasonNumber - 1) + ?.episodes?.getOrNull(currentEpisode.episodeNumber!! - 1) } else { null }