From 5599739433051ecf50ef81e362f55bfdfe3a6005 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Thu, 3 Oct 2019 18:25:50 +0200
Subject: [PATCH] Fix lowercased playlist album artist column

Fixes #275
---
 src/core/song.cpp         | 3 ++-
 src/core/song.h           | 1 +
 src/playlist/playlist.cpp | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/core/song.cpp b/src/core/song.cpp
index 938e88779..b1e7548e6 100644
--- a/src/core/song.cpp
+++ b/src/core/song.cpp
@@ -296,7 +296,8 @@ const QString &Song::albumartist() const { return d->albumartist_; }
 const QString &Song::albumartist_sortable() const { return d->albumartist_sortable_; }
 const QString &Song::effective_albumartist() const { return d->albumartist_.isEmpty() ? d->artist_ : d->albumartist_; }
 const QString &Song::effective_albumartist_sortable() const { return d->albumartist_.isEmpty() ? d->artist_sortable_ : d->albumartist_sortable_; }
-const QString &Song::playlist_albumartist() const { return is_compilation() ? d->albumartist_sortable_ : effective_albumartist_sortable(); }
+const QString &Song::playlist_albumartist() const { return is_compilation() ? d->albumartist_ : effective_albumartist(); }
+const QString &Song::playlist_albumartist_sortable() const { return is_compilation() ? d->albumartist_sortable_ : effective_albumartist_sortable(); }
 int Song::track() const { return d->track_; }
 int Song::disc() const { return d->disc_; }
 int Song::year() const { return d->year_; }
diff --git a/src/core/song.h b/src/core/song.h
index 6cf80c47f..db7bade45 100644
--- a/src/core/song.h
+++ b/src/core/song.h
@@ -252,6 +252,7 @@ class Song {
 
   // Playlist views are special because you don't want to fill in album artists automatically for compilations, but you do for normal albums:
   const QString &playlist_albumartist() const;
+  const QString &playlist_albumartist_sortable() const;
 
   // Returns true if this Song had it's cover manually unset by user.
   bool has_manually_unset_cover() const;
diff --git a/src/playlist/playlist.cpp b/src/playlist/playlist.cpp
index 672b6fa5e..d4106f34a 100644
--- a/src/playlist/playlist.cpp
+++ b/src/playlist/playlist.cpp
@@ -1121,7 +1121,7 @@ bool Playlist::CompareItems(int column, Qt::SortOrder order, shared_ptr<Playlist
     case Column_Year:         cmp(year);
     case Column_OriginalYear: cmp(originalyear);
     case Column_Genre:        strcmp(genre);
-    case Column_AlbumArtist:  strcmp(playlist_albumartist);
+    case Column_AlbumArtist:  strcmp(playlist_albumartist_sortable);
     case Column_Composer:     strcmp(composer);
     case Column_Performer:    strcmp(performer);
     case Column_Grouping:     strcmp(grouping);