Merge branch 'master' into connection-manager-global

2020-09-01 10:16:21 +02:00
parent 73c7dfa0dd 924e8df815
commit 3cbe0f7264
139 changed files with 1032 additions and 3566 deletions
@@ -369,18 +369,8 @@ import 'emby-playstatebutton';
                    }
                }
            } else {
-                let showArtist = options.artist === true;
-                const artistItems = item.ArtistItems;
-
-                if (!showArtist && options.artist !== false) {
-                    if (!artistItems || !artistItems.length) {
-                        showArtist = true;
-                    } else if (artistItems.length > 1 || !containerAlbumArtistIds.includes(artistItems[0].Id)) {
-                        showArtist = true;
-                    }
-                }
-
-                if (showArtist) {
+                if (options.artist) {
+                    const artistItems = item.ArtistItems;
                    if (artistItems && item.Type !== 'MusicAlbum') {
                        textlines.push(artistItems.map(a => {
                            return a.Name;