Ticket #8856: StartRecording-WaitForTune.patch

libs/libmythtv/tv_rec.cpp

@@ -122 +122 @@
       stateChangeLock(QMutex::Recursive),
       pendingRecLock(QMutex::Recursive),
       internalState(kState_None), desiredNextState(kState_None),
-      changeState(false), pauseNotify(true),
+      changeState(false), m_isTuned(true), pauseNotify(true),
       stateFlags(0), lastTuningRequest(0),
       triggerEventLoopLock(QMutex::NonRecursive),
       triggerEventLoopSignal(false),
@@ -1618 +1618 @@
         stateChangeLock.lock();
 
         // verify that we were triggered.
-        ok = (tuningRequests.empty() && !changeState);
+        ok = (tuningRequests.empty() && m_isTuned && !changeState);
     }
     return ok;
 }
@@ -3507 +3507 @@
 
         // The dequeue isn't safe to do until now because we
         // release the stateChangeLock to teardown a recorder
+        m_isTuned = false;
         tuningRequests.dequeue();
 
         // Now we start new stuff
@@ -3542 +3543 @@
     if (HasFlags(kFlagWaitingForSignal) && !(streamData = TuningSignalCheck()))
         return;
 
+    m_isTuned = true;
+
     if (HasFlags(kFlagNeedToStartRecorder))
     {
         if (recorder)

libs/libmythtv/tv_rec.h

@@ -355 +355 @@
     TVState        internalState;
     TVState        desiredNextState;
     bool           changeState;
+    bool           m_isTuned;
     bool           pauseNotify;
     uint           stateFlags;
     TuningQueue    tuningRequests;