Ticket #10834: showOnlyActiveTuner.diff

mythtv/programs/mythwelcome/welcomedialog.cpp

@@ -348 +348 @@
         // update recording
         if (m_isRecording && m_tunerList.size())
         {
-            if (m_screenTunerNo >= m_tunerList.size())
-                m_screenTunerNo = 0;
-
-            TunerStatus tuner = m_tunerList[m_screenTunerNo];
-
-            if (tuner.isRecording)
-            {
-                status = QObject::tr("Tuner %1 is recording:\n")
-                    .arg(tuner.id);
-                status += tuner.channame;
-                status += "\n" + tuner.title;
-                if (!tuner.subtitle.isEmpty())
-                    status += "\n("+tuner.subtitle+")";
-                status += "\n" + tuner.startTime.toString(m_timeFormat) +
-                          " " + tr("to") + " " + tuner.endTime.toString(m_timeFormat);
-            }
-            else
-            {
-                status = QObject::tr("Tuner %1 is not recording")
-                    .arg(tuner.id);
-            }
-
-            if (m_screenTunerNo < m_tunerList.size() - 1)
+            TunerStatus tuner = m_tunerList[m_screenTunerNo];
+            
+            do
+            {
+              if (m_screenTunerNo < m_tunerList.size() - 1)
                 m_screenTunerNo++;
-            else
+              else
                 m_screenTunerNo = 0;
+              
+              tuner = m_tunerList[m_screenTunerNo];
+            }
+            while (!tuner.isRecording)
+            
+            status = QObject::tr("Tuner %1 is recording:\n")
+                .arg(tuner.id);
+            status += tuner.channame;
+            status += "\n" + tuner.title;
+            if (!tuner.subtitle.isEmpty())
+                status += "\n("+tuner.subtitle+")";
+            status += "\n" + tuner.startTime.toString(m_timeFormat) +
+                      " " + tr("to") + " " + tuner.endTime.toString(m_timeFormat);
+                      
         }
         else
             status = tr("There are no recordings currently taking place");