From 7842eef4a634a05a7c9f9d19f069745ddb9f05f5 Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Sat, 12 Mar 2022 22:34:22 +0300 Subject: [PATCH 1/2] Fix theme queue Set play options for each item so that the playback manager doesn't change the fullscreen state for the next item. --- src/components/themeMediaPlayer.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/components/themeMediaPlayer.js b/src/components/themeMediaPlayer.js index 5a07b219d8..4c01e299e4 100644 --- a/src/components/themeMediaPlayer.js +++ b/src/components/themeMediaPlayer.js @@ -22,6 +22,13 @@ function playThemeMedia(items, ownerId) { return i.Id; }); + currentThemeItems.forEach((i) => { + i.playOptions = { + fullscreen: false, + enableRemotePlayers: false + }; + }); + playbackManager.play({ items: currentThemeItems, fullscreen: false, From 3909398dc3a2099ae694ea73c240c03cb5bf5471 Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Sat, 12 Mar 2022 22:48:00 +0300 Subject: [PATCH 2/2] Fix theme songs with disabled theme videos --- src/components/themeMediaPlayer.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/themeMediaPlayer.js b/src/components/themeMediaPlayer.js index 4c01e299e4..073f891c30 100644 --- a/src/components/themeMediaPlayer.js +++ b/src/components/themeMediaPlayer.js @@ -72,12 +72,12 @@ function loadThemeMedia(item) { const apiClient = ServerConnections.getApiClient(item.ServerId); apiClient.getThemeMedia(apiClient.getCurrentUserId(), item.Id, true).then(function (themeMediaResult) { - const ownerId = themeMediaResult.ThemeVideosResult.Items.length ? themeMediaResult.ThemeVideosResult.OwnerId : themeMediaResult.ThemeSongsResult.OwnerId; + const result = userSettings.enableThemeVideos() && themeMediaResult.ThemeVideosResult.Items.length ? themeMediaResult.ThemeVideosResult : themeMediaResult.ThemeSongsResult; + + const ownerId = result.OwnerId; if (ownerId !== currentOwnerId) { - const items = themeMediaResult.ThemeVideosResult.Items.length ? themeMediaResult.ThemeVideosResult.Items : themeMediaResult.ThemeSongsResult.Items; - - playThemeMedia(items, ownerId); + playThemeMedia(result.Items, ownerId); } }); }