Merge pull request #17234 from Eneo-org/fix/syncplay-playqueue-index

Fix play queue index handling in SyncPlay

1 files changed, 22 insertions, 3 deletions

diff --git a/MediaBrowser.Controller/SyncPlay/Queue/PlayQueueManager.cs b/MediaBrowser.Controller/SyncPlay/Queue/PlayQueueManager.cs
index c0a168192e..9326864d78 100644
--- a/MediaBrowser.Controller/SyncPlay/Queue/PlayQueueManager.cs
+++ b/MediaBrowser.Controller/SyncPlay/Queue/PlayQueueManager.cs
@@ -272,7 +272,7 @@ namespace MediaBrowser.Controller.SyncPlay.Queue
         public void SetPlayingItemByIndex(int playlistIndex)
         {
             var playlist = GetPlaylistInternal();
-            if (playlistIndex < 0 || playlistIndex > playlist.Count)
+            if (playlistIndex < 0 || playlistIndex >= playlist.Count)
             {
                 PlayingItemIndex = NoPlayingItemIndex;
             }
@@ -293,6 +293,15 @@ namespace MediaBrowser.Controller.SyncPlay.Queue
         {
             var playingItem = GetPlayingItem();
 
+            // Removed items that precede the playing item shift its index as well.
+            var removedBeforePlayingItem = 0;
+            if (playingItem is not null)
+            {
+                removedBeforePlayingItem = GetPlaylistInternal()
+                    .Take(PlayingItemIndex)
+                    .Count(item => playlistItemIds.Contains(item.PlaylistItemId));
+            }
+
             _sortedPlaylist.RemoveAll(item => playlistItemIds.Contains(item.PlaylistItemId));
             _shuffledPlaylist.RemoveAll(item => playlistItemIds.Contains(item.PlaylistItemId));
 
@@ -303,12 +312,12 @@ namespace MediaBrowser.Controller.SyncPlay.Queue
                 if (playlistItemIds.Contains(playingItem.PlaylistItemId))
                 {
                     // Playing item has been removed, picking previous item.
-                    PlayingItemIndex--;
+                    PlayingItemIndex -= removedBeforePlayingItem + 1;
                     if (PlayingItemIndex < 0)
                     {
                         // Was first element, picking next if available.
                         // Default to no playing item otherwise.
-                        PlayingItemIndex = _sortedPlaylist.Count > 0 ? 0 : NoPlayingItemIndex;
+                        PlayingItemIndex = GetPlaylistInternal().Count > 0 ? 0 : NoPlayingItemIndex;
                     }
 
                     return true;
@@ -444,6 +453,11 @@ namespace MediaBrowser.Controller.SyncPlay.Queue
         /// <returns><c>true</c> if the playing item changed; <c>false</c> otherwise.</returns>
         public bool Next()
         {
+            if (GetPlaylistInternal().Count == 0)
+            {
+                return false;
+            }
+
             if (RepeatMode.Equals(GroupRepeatMode.RepeatOne))
             {
                 LastChange = DateTime.UtcNow;
@@ -474,6 +488,11 @@ namespace MediaBrowser.Controller.SyncPlay.Queue
         /// <returns><c>true</c> if the playing item changed; <c>false</c> otherwise.</returns>
         public bool Previous()
         {
+            if (GetPlaylistInternal().Count == 0)
+            {
+                return false;
+            }
+
             if (RepeatMode.Equals(GroupRepeatMode.RepeatOne))
             {
                 LastChange = DateTime.UtcNow;