From 0a92fbc18e9ae84ca088f96078acd8705269bec9 Mon Sep 17 00:00:00 2001
From: geneticdrift <geneticdrift@iotide.com>
Date: Wed, 22 Apr 2020 21:55:02 +0200
Subject: [PATCH] tag/Fallback: add tag fallback for AlbumSort

Closes https://github.com/MusicPlayerDaemon/MPD/issues/832
---
 NEWS                 | 2 ++
 src/tag/Fallback.hxx | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/NEWS b/NEWS
index 68b2e5558..264ac1737 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
 ver 0.21.23 (not yet released)
+* protocol
+  - add tag fallback for AlbumSort
 * storage
   - curl: fix corrupt "href" values in the presence of XML entities
   - curl: unescape "href" values
diff --git a/src/tag/Fallback.hxx b/src/tag/Fallback.hxx
index ecbe0d439..fb07fc1e8 100644
--- a/src/tag/Fallback.hxx
+++ b/src/tag/Fallback.hxx
@@ -45,6 +45,10 @@ ApplyTagFallback(TagType type, F &&f) noexcept
 		   "AlbumArtist"/"ArtistSort" was found */
 		return f(TAG_ARTIST);
 
+	if (type == TAG_ALBUM_SORT)
+		/* fall back to "Album" if no "AlbumSort" was found */
+		return f(TAG_ALBUM);
+
 	return false;
 }