From ae4dba71cb8ae77ffb3faca42e1dba0c789dd8e7 Mon Sep 17 00:00:00 2001
From: "craig.p.drummond" <craig.p.drummond@gmail.com>
Date: Fri, 17 Oct 2014 16:07:26 +0000
Subject: [PATCH] Combine performers with ", " BUG: 565

---
 mpd/mpdparseutils.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mpd/mpdparseutils.cpp b/mpd/mpdparseutils.cpp
index 979744c21..a1db19a4e 100644
--- a/mpd/mpdparseutils.cpp
+++ b/mpd/mpdparseutils.cpp
@@ -311,7 +311,11 @@ Song MPDParseUtils::parseSong(const QList<QByteArray> &lines, Location location)
             song.setMbAlbumId(line.mid(constAlbumId.length()));
         } else if ((Loc_Search==location || Loc_Playlists==location || Loc_PlayQueue==location)  &&
                    line.startsWith(constPerformerKey)) {
-            song.setPerformer(QString::fromUtf8(line.mid(constPerformerKey.length())));
+            if (song.hasPerformer()) {
+                song.setPerformer(song.performer()+QLatin1String(", ")+QString::fromUtf8(line.mid(constPerformerKey.length())));
+            } else {
+                song.setPerformer(QString::fromUtf8(line.mid(constPerformerKey.length())));
+            }
         } else if (Loc_PlayQueue==location) {
             if (line.startsWith(constPriorityKey)) {
                 song.priority = line.mid(constPriorityKey.length()).toUInt();