From fd55eb99ac960d248f1dce32684719b2b790e8f7 Mon Sep 17 00:00:00 2001
From: Mariusz Chryc <chrycm1995@gmail.com>
Date: Wed, 29 Jul 2020 17:49:07 +0200
Subject: [PATCH 1/3] Fix updateNowPlayingInfo when artist or album are empty

---
 src/components/remotecontrol/remotecontrol.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js
index db2bed36a71..24e58404d85 100644
--- a/src/components/remotecontrol/remotecontrol.js
+++ b/src/components/remotecontrol/remotecontrol.js
@@ -119,9 +119,9 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
             var nowPlayingServerId = (item.ServerId || serverId);
             if (item.Type == 'Audio' || item.MediaStreams[0].Type == 'Audio') {
                 var songName = item.Name;
-                if (item.Album != null && item.Artists != null) {
-                    var artistsSeries = '';
-                    var albumName = item.Album;
+                var artistsSeries = '';
+                var albumName = '';
+                if (item.Artists != null) {
                     if (item.ArtistItems != null) {
                         for (const artist of item.ArtistItems) {
                             let artistName = artist.Name;
@@ -142,9 +142,12 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
                             }
                         }
                     }
-                    context.querySelector('.nowPlayingArtist').innerHTML = artistsSeries;
-                    context.querySelector('.nowPlayingAlbum').innerHTML = '<a class="button-link emby-button" is="emby-linkbutton" href="details?id=' + item.AlbumId + `&serverId=${nowPlayingServerId}">${albumName}</a>`;
                 }
+                if (item.Album != null){
+                    albumName = '<a class="button-link emby-button" is="emby-linkbutton" href="details?id=' + item.AlbumId + `&serverId=${nowPlayingServerId}">` + item.Album + `</a>`;
+                }
+                context.querySelector('.nowPlayingAlbum').innerHTML = albumName
+                context.querySelector('.nowPlayingArtist').innerHTML = artistsSeries;
                 context.querySelector('.nowPlayingSongName').innerHTML = songName;
             } else if (item.Type == 'Episode') {
                 if (item.SeasonName != null) {

From 260668f501b7018c93b9bdf4aa302455f4362484 Mon Sep 17 00:00:00 2001
From: Mariusz Chryc <chrycm1995@gmail.com>
Date: Wed, 29 Jul 2020 18:05:45 +0200
Subject: [PATCH 2/3] Fix lintint errors

---
 src/components/remotecontrol/remotecontrol.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js
index 24e58404d85..c0d594f1234 100644
--- a/src/components/remotecontrol/remotecontrol.js
+++ b/src/components/remotecontrol/remotecontrol.js
@@ -143,10 +143,10 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
                         }
                     }
                 }
-                if (item.Album != null){
-                    albumName = '<a class="button-link emby-button" is="emby-linkbutton" href="details?id=' + item.AlbumId + `&serverId=${nowPlayingServerId}">` + item.Album + `</a>`;
+                if (item.Album != null) {
+                    albumName = '<a class="button-link emby-button" is="emby-linkbutton" href="details?id=' + item.AlbumId + '&serverId=${nowPlayingServerId}">' + item.Album + '</a>';
                 }
-                context.querySelector('.nowPlayingAlbum').innerHTML = albumName
+                context.querySelector('.nowPlayingAlbum').innerHTML = albumName;
                 context.querySelector('.nowPlayingArtist').innerHTML = artistsSeries;
                 context.querySelector('.nowPlayingSongName').innerHTML = songName;
             } else if (item.Type == 'Episode') {

From 56aaed9f816acfc1ec0dac69ae02484562026205 Mon Sep 17 00:00:00 2001
From: Mariusz Chryc <chrycm1995@gmail.com>
Date: Wed, 29 Jul 2020 18:11:27 +0200
Subject: [PATCH 3/3] Fix string

---
 src/components/remotecontrol/remotecontrol.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js
index c0d594f1234..13fa8c0887c 100644
--- a/src/components/remotecontrol/remotecontrol.js
+++ b/src/components/remotecontrol/remotecontrol.js
@@ -144,7 +144,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
                     }
                 }
                 if (item.Album != null) {
-                    albumName = '<a class="button-link emby-button" is="emby-linkbutton" href="details?id=' + item.AlbumId + '&serverId=${nowPlayingServerId}">' + item.Album + '</a>';
+                    albumName = '<a class="button-link emby-button" is="emby-linkbutton" href="details?id=' + item.AlbumId + `&serverId=${nowPlayingServerId}">` + item.Album + '</a>';
                 }
                 context.querySelector('.nowPlayingAlbum').innerHTML = albumName;
                 context.querySelector('.nowPlayingArtist').innerHTML = artistsSeries;