From 5eeea800fc05be6b0348302c8ced5ccce6f29f97 Mon Sep 17 00:00:00 2001 From: Ethan Pippin Date: Sat, 1 Jan 2022 00:12:03 -0700 Subject: [PATCH] refine auto play --- JellyfinPlayer/Views/VideoPlayer/VLCPlayerViewController.swift | 2 +- .../BaseItemDto+VideoPlayerViewModel.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/JellyfinPlayer/Views/VideoPlayer/VLCPlayerViewController.swift b/JellyfinPlayer/Views/VideoPlayer/VLCPlayerViewController.swift index b16d908e..35d872f5 100644 --- a/JellyfinPlayer/Views/VideoPlayer/VLCPlayerViewController.swift +++ b/JellyfinPlayer/Views/VideoPlayer/VLCPlayerViewController.swift @@ -385,7 +385,7 @@ extension VLCPlayerViewController: VLCMediaPlayerDelegate { viewModel.playerState = vlcMediaPlayer.state if vlcMediaPlayer.state == VLCMediaPlayerState.ended { - if viewModel.autoPlayNextItem && viewModel.nextItemVideoPlayerViewModel != nil { + if viewModel.autoPlayNextItem && viewModel.shouldShowAutoPlayNextItem && viewModel.nextItemVideoPlayerViewModel != nil { didSelectNextItem() } else { didSelectClose() diff --git a/Shared/Extensions/JellyfinAPIExtensions/BaseItemDto+VideoPlayerViewModel.swift b/Shared/Extensions/JellyfinAPIExtensions/BaseItemDto+VideoPlayerViewModel.swift index ff60582b..959a91bf 100644 --- a/Shared/Extensions/JellyfinAPIExtensions/BaseItemDto+VideoPlayerViewModel.swift +++ b/Shared/Extensions/JellyfinAPIExtensions/BaseItemDto+VideoPlayerViewModel.swift @@ -94,7 +94,7 @@ extension BaseItemDto { // TODO: show adjacent items - let shouldShowAutoPlayNextItem = Defaults[.shouldShowAutoPlayNextItem] + let shouldShowAutoPlayNextItem = Defaults[.shouldShowAutoPlayNextItem] && itemType == .episode let autoPlayNextItem = Defaults[.autoPlayNextItem] let videoPlayerViewModel = VideoPlayerViewModel(item: self,