Ticket #1082: prevep-title.diff

libs/libmythtv/previouslist.h

@@ -58 +58 @@
     QStringList viewTextList;
 
     int curItem;
+    bool titleMatch; ///< do all the matches have the same title?
     ProgramList itemList;
-    ProgramList schedList;
 
     XMLParse *theme;
     QDomElement xmldata;

libs/libmythtv/previouslist.cpp

@@ -485 +518 @@
     itemList.FromOldRecorded(sql, bindings); 
 
     vector<ProgramInfo *> sortedList;
+
+    if (itemList.count() <= 1) titleMatch = false;
+    else {
+        titleMatch = true;
+        ProgramList::iterator j = itemList.begin();
+        QString commonTitle = (*j)->title;
+        while (titleMatch && j != itemList.end()) {
+            if (commonTitle != (*j)->title) titleMatch = false;
+            j++;
+        }
+    }
+
     while (itemList.count())
     {
         s = itemList.take();
-        s->sortTitle = s->title;
+        if (titleMatch) s->sortTitle = s->title;
+        else s->sortTitle = s->subtitle;
         s->sortTitle.remove(QRegExp("^(The |A |An )"));
         sortedList.push_back(s);
     }
@@ -580 +630 @@
 
                 if (pi->subtitle == "")
                     tmptitle = pi->title;
+                else if (titleMatch)
+                    tmptitle = pi->subtitle;
                 else
                 {
                      tmptitle = QString("%1 - \"%2\"")