From 011ea6ebada581a5eb8d1b4e515a855b60ef4801 Mon Sep 17 00:00:00 2001
From: "craig.p.drummond"
 <craig.p.drummond@b1e49159-3266-923f-9c3e-04f16369770a>
Date: Wed, 7 May 2014 18:53:37 +0000
Subject: [PATCH] Compare albumId OR album name

---
 mpd/song.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/mpd/song.cpp b/mpd/song.cpp
index edd6c3836..94738bf6f 100644
--- a/mpd/song.cpp
+++ b/mpd/song.cpp
@@ -216,11 +216,7 @@ int Song::compareTo(const Song &o) const
         if (0!=compare) {
             return compare;
         }
-        compare=album.localeAwareCompare(o.album);
-        if (0!=compare) {
-            return compare;
-        }
-        mbAlbumId.compare(o.mbAlbumId);
+        compare=mbAlbumId.isEmpty() ? album.localeAwareCompare(o.album) : mbAlbumId.compare(o.mbAlbumId);
         if (0!=compare) {
             return compare;
         }