From 3909398dc3a2099ae694ea73c240c03cb5bf5471 Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Sat, 12 Mar 2022 22:48:00 +0300
Subject: [PATCH] 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 4c01e299e..073f891c3 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);
         }
     });
 }