From 7aaab192d63e6572ea7914ad41f2fb5de401f75d Mon Sep 17 00:00:00 2001
From: Craig Drummond <craig.p.drummond@gmail.com>
Date: Sun, 26 Feb 2017 11:14:52 +0000
Subject: [PATCH] Only show sub-text if we have some info

---
 models/playlistsmodel.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/models/playlistsmodel.cpp b/models/playlistsmodel.cpp
index dd2ab38ab..624c1c1ec 100644
--- a/models/playlistsmodel.cpp
+++ b/models/playlistsmodel.cpp
@@ -487,7 +487,9 @@ QVariant PlaylistsModel::data(const QModelIndex &index, int role) const
         case Cantata::Role_MainText:
             return s->title.isEmpty() ? s->file : s->title;
         case Cantata::Role_SubText:
-            return s->artist+QLatin1String(" - ")+s->displayAlbum()+QLatin1String(" - ")+Utils::formatTime(s->time);
+            return (s->artist.isEmpty() ? QString() : (s->artist+QLatin1String(" - ")))+
+                   (s->displayAlbum().isEmpty() ? QString() : (s->displayAlbum()+QLatin1String(" - ")))+
+                   (s->time>0 ? Utils::formatTime(s->time) : QString());
         default:
             return ActionModel::data(index, role);
         }