From 64a4e4bc0bf6076ccb57fcc2ac13f9805afb05fc Mon Sep 17 00:00:00 2001
From: "craig.p.drummond"
 <craig.p.drummond@b1e49159-3266-923f-9c3e-04f16369770a>
Date: Wed, 20 Mar 2013 20:13:08 +0000
Subject: [PATCH] Always use name, if set

---
 mpd/mpdparseutils.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mpd/mpdparseutils.cpp b/mpd/mpdparseutils.cpp
index b475b3d81..a464377e3 100644
--- a/mpd/mpdparseutils.cpp
+++ b/mpd/mpdparseutils.cpp
@@ -225,14 +225,14 @@ Song MPDParseUtils::parseSong(const QByteArray &data, bool isPlayQueue)
     #endif
 
     if (isPlayQueue) {
-        if (song.title.isEmpty() && !song.file.isEmpty()) {
+        if (!song.file.isEmpty()) {
             if (song.isStream()) {
                 if (!song.isCantataStream()) {
                     QString name=getName(song.file);
                     if (!name.isEmpty()) {
                         song.name=name;
                     }
-                    if (song.name.isEmpty()) {
+                    if (song.title.isEmpty() && song.name.isEmpty()) {
                         song.title=Utils::getFile(QUrl(song.file).path());
                     }
                 }