From ea96c5b64b1fd1a0ae152363c5ec804eaf960dcf Mon Sep 17 00:00:00 2001
From: Arno <am@disconnect.de>
Date: Fri, 12 Jul 2013 14:48:53 +0200
Subject: Always show subtitle in ArchiveModel

---
 archivemodel.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'archivemodel.cpp')

diff --git a/archivemodel.cpp b/archivemodel.cpp
index fe0ffff..621ee9c 100644
--- a/archivemodel.cpp
+++ b/archivemodel.cpp
@@ -67,16 +67,14 @@ QVariant ArchiveModel::data(const QModelIndex &index, int role) const{
         if(nodeType == SeriesNode || nodeType == GenreNode || nodeType == ActorNode){
             retval = QString("%1 (%2)").arg(item->data(Name).toString()).arg(QString::number(childCount));
         }else if(nodeType == SeriesPartNode){
+            retval = item->data(Name).toString();
+            QString subtitle = item->data(Subtitle).toString();
             if(part > 0){
-                retval = QString("%1 %2").arg(item->data(Name).toString()).arg(QString::number(part));
-            }else{
-                QString subtitle = item->data(Subtitle).toString();
-                if(!subtitle.isEmpty()){
-                    retval = QString("%1 - %2").arg(item->data(Name).toString()).arg(item->data(Subtitle).toString());
-                }
+                retval = QString("%1 %2").arg(retval).arg(QString::number(part));
+            }
+            if(!subtitle.isEmpty()){
+                retval = QString("%1 - %2").arg(retval).arg(subtitle);
             }
-        }else{
-            retval = item->data(Name).toString();
         }
         return retval;
     }
-- 
cgit v1.2.3-70-g09d2