From 1b8adf0f7c21f6596e2fdcc0ac431c831d0ad582 Mon Sep 17 00:00:00 2001 From: BaronGreenback Date: Thu, 22 Oct 2020 13:28:09 +0100 Subject: [PATCH 1/2] Update Emby.Server.Implementations/SyncPlay/GroupController.cs --- Emby.Server.Implementations/SyncPlay/GroupController.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Emby.Server.Implementations/SyncPlay/GroupController.cs b/Emby.Server.Implementations/SyncPlay/GroupController.cs index 26972de8aa..2d86680149 100644 --- a/Emby.Server.Implementations/SyncPlay/GroupController.cs +++ b/Emby.Server.Implementations/SyncPlay/GroupController.cs @@ -174,8 +174,10 @@ namespace Emby.Server.Implementations.SyncPlay case SyncPlayBroadcastType.CurrentSession: return new SessionInfo[] { from }; case SyncPlayBroadcastType.AllGroup: - return Participants.Values.Select( - session => session.Session).ToArray(); + return Participants + .Values + .Select(session => session.Session) + .ToArray(); case SyncPlayBroadcastType.AllExceptCurrentSession: return Participants.Values.Select( session => session.Session).Where( From f6ab98507ec6ac25e9b2239e519118db07672592 Mon Sep 17 00:00:00 2001 From: BaronGreenback Date: Thu, 22 Oct 2020 13:29:09 +0100 Subject: [PATCH 2/2] Update MediaBrowser.Controller/SyncPlay/Queue/PlayQueueManager.cs --- MediaBrowser.Controller/SyncPlay/Queue/PlayQueueManager.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MediaBrowser.Controller/SyncPlay/Queue/PlayQueueManager.cs b/MediaBrowser.Controller/SyncPlay/Queue/PlayQueueManager.cs index aca50f80a7..6373a52116 100644 --- a/MediaBrowser.Controller/SyncPlay/Queue/PlayQueueManager.cs +++ b/MediaBrowser.Controller/SyncPlay/Queue/PlayQueueManager.cs @@ -486,7 +486,10 @@ namespace MediaBrowser.Controller.SyncPlay ShufflePlaylist(); break; default: + if (!ShuffleMode.Equals(mode)) + { SortShuffledPlaylist(); + } break; } }