Ticket #9610: zero_byte.diff

programs/mythbackend/mainserver.cpp

@@ -2240 +2240 @@
     if (ismaster && recinfo.GetHostname() != gCoreContext->GetHostName())
     {
         PlaybackSock *slave = GetSlaveByHostname(recinfo.GetHostname());
+        RecStatusType status = recinfo.GetRecordingStatus();
 
         if (slave)
         {
@@ -2248 +2249 @@
             if (num > 0)
             {
                 (*encoderList)[num]->StopRecording();
-                recinfo.SetRecordingStatus(rsRecorded);
+                if (status == rsRecording)
+                    recinfo.SetRecordingStatus(rsRecorded);
+                else if (status != rsRecorded && status != rsFailed)
+                    recinfo.SetRecordingStatus(rsFailed);
                 if (m_sched)
                     m_sched->UpdateRecStatus(&recinfo);
             }
@@ -2267 +2271 @@
             // recording has stopped and the status should be updated.
             // Continue so that the master can try to update the endtime
             // of the file is in a shared directory.
-            recinfo.SetRecordingStatus(rsRecorded);
+            if (status == rsRecording)
+                recinfo.SetRecordingStatus(rsRecorded);
+            else if (status != rsRecorded && status != rsFailed)
+                recinfo.SetRecordingStatus(rsFailed);
             if (m_sched)
                 m_sched->UpdateRecStatus(&recinfo);
         }
@@ -2295 +2302 @@
 
             if (ismaster)
             {
-                recinfo.SetRecordingStatus(rsRecorded);
+                RecStatusType status = recinfo.GetRecordingStatus();
+
+                if (status == rsRecording)
+                    recinfo.SetRecordingStatus(rsRecorded);
+                else if (status != rsRecorded && status != rsFailed)
+                    recinfo.SetRecordingStatus(rsFailed);
                 if (m_sched)
                     m_sched->UpdateRecStatus(&recinfo);
             }
@@ -2400 +2412 @@
             if (num > 0)
             {
                 (*encoderList)[num]->StopRecording();
-                recinfo.SetRecordingStatus(rsRecorded);
+                if (recinfo.GetRecordingStatus() == rsRecording)
+                    recinfo.SetRecordingStatus(rsRecorded);
+                else if (recinfo.GetRecordingStatus() != rsFailed)
+                    recinfo.SetRecordingStatus(rsFailed);
                 if (m_sched)
                     m_sched->UpdateRecStatus(&recinfo);
             }
@@ -2441 +2456 @@
 
             if (ismaster)
             {
-                recinfo.SetRecordingStatus(rsRecorded);
+                if (recinfo.GetRecordingStatus() == rsRecording)
+                    recinfo.SetRecordingStatus(rsRecorded);
+                else if (recinfo.GetRecordingStatus() != rsFailed)
+                    recinfo.SetRecordingStatus(rsFailed);
                 if (m_sched)
                     m_sched->UpdateRecStatus(&recinfo);
             }

libs/libmythtv/tv_rec.cpp

@@ -874 +874 @@
     VERBOSE(VB_RECORD, LOC + QString("FinishedRecording(%1) in recgroup: %2")
             .arg(curRec->GetTitle()).arg(recgrp));
 
-    if (curRec->GetRecordingStatus() != rsFailed)
+    RecStatusType status = curRec->GetRecordingStatus();
+
+    if (status == rsRecording)
         curRec->SetRecordingStatus(rsRecorded);
+    else if (status != rsRecorded && status != rsFailed)
+        curRec->SetRecordingStatus(rsFailed);
     curRec->SetRecordingEndTime(mythCurrentDateTime());
 
     if (tvchain)