Ticket #5341: GetNextLiveTVDir_tryLock.diff

mythtv/programs/mythbackend/scheduler.cpp

@@ -3679 +3679 @@
 
 void Scheduler::GetNextLiveTVDir(int cardid)
 {
-    QMutexLocker lockit(reclist_lock);
+    int lock_attempts = 0;
+
+    while (lock_attempts++ < 5 && !reclist_lock->tryLock())
+    {
+        VERBOSE(VB_IMPORTANT, LOC + "FindNextLiveTVDir: tryLock failed: "<<lock_attempts);
+        usleep(5000);
+    }
+
+    if (lock_attempts >= 5)
+        return;
 
     ProgramInfo *pginfo = new ProgramInfo;
 
@@ -3701 +3710 @@
 
     int fsID = FillRecordingDir(pginfo, reclist);
 
+    reclist_lock->unlock();
+
     tv->SetNextLiveTVDir(pginfo->pathname);
 
     VERBOSE(VB_RECORD, LOC + QString("FindNextLiveTVDir: next dir is '%1'")