In album and genre views, sort albums by album artist AND album name

app/plugins/music_service/mpd/index.js

@@ -2998,14 +2998,18 @@ ControllerMpd.prototype.listAlbums = function (ui) {
                         }
                     }
                 }
-                // Sort albums by album artist, because the order produced by mpd is dependent on the
-                //  filesystem from which the albums were read, i.e. if audio files are stored in the
-                //  folders 'A' and 'B', then all albums in 'A' come before those in 'B'.
-                // Within 'A' and 'B' albums are typically sorted by album artist. Its partially
+                // Sort albums by album artist and album name, because the order produced by
+                //  mpd is dependent on the filesystem from which the albums were read, i.e.
+                //  if audio files are stored in the folders 'A' and 'B', then all albums
+                //  in 'A' come before those in 'B'.
+                // Within a folder albums are typically sorted by album artist. Its partially
                 //  sorted nature makes the albums array a good candidate for Timsort.
                 //  https://en.wikipedia.org/wiki/Timsort
                 timSort.sort(response.navigation.lists[0].items, function (a, b) {
-                    return a.artist.localeCompare(b.artist);
+                    if (a.artist === b.artist)
+                        return a.title.localeCompare(b.title);
+                    else
+                        return a.artist.localeCompare(b.artist);
                 });
 				//Save response in albumList cache for future use
 				memoryCache.set("cacheAlbumList", response);
@@ -3640,7 +3644,10 @@ ControllerMpd.prototype.listGenre = function (curUri) {
                         return a.title.localeCompare(b.title)
                     });
                     response.navigation.lists[1].items.sort(function (a,b) {
-                        return a.artist.localeCompare(b.artist)
+                        if (a.artist === b.artist)
+                            return a.title.localeCompare(b.title);
+                        else
+                            return a.artist.localeCompare(b.artist);
                     });
                     response.navigation.lists[0].items.sort(function (a,b) {
                         return a.title.localeCompare(b.title)