Revert "Try to fix corner cases when stopping in-progress recordings."

This broke livetv for many people. The auto-expirer would delete the in-use file during playback. This reverts commit a1b5067.
MythTV · Jun 5, 2014 · 427a72d · 427a72d
1 parent a1b5067
commit 427a72d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/mythtv/libs/libmyth/programinfo.h b/mythtv/libs/libmyth/programinfo.h
@@ -303,9 +303,7 @@ class MPUBLIC ProgramInfo
     // Used for extending scheduled recordings
     bool IsSameProgramWeakCheck(const ProgramInfo &other) const;
     bool IsSameRecording(const ProgramInfo &other) const
-        { return title == other.title &&
-                chanid == other.chanid &&
-                recstartts == other.recstartts; }
+        { return chanid == other.chanid && recstartts == other.recstartts; }
 
     // Quick gets
     /// Creates a unique string that can be used to identify an

diff --git a/mythtv/programs/mythbackend/encoderlink.cpp b/mythtv/programs/mythbackend/encoderlink.cpp
@@ -274,11 +274,7 @@ bool EncoderLink::MatchesRecording(const ProgramInfo *rec)
 
         if (tvrec)
         {
-            retval = (rec->GetInputID() == 0 &&
-                      tvrec->IsSameRecording(*rec)) ||
-                (rec->GetInputID() == tvrec->GetInputID() &&
-                 tvrec->IsSameProgramWeakCheck(*rec))
-;
+            retval = tvrec->IsSameRecording(*rec);
             delete tvrec;
         }
     }

diff --git a/mythtv/programs/mythfrontend/schedulecommon.cpp b/mythtv/programs/mythfrontend/schedulecommon.cpp
@@ -453,7 +453,10 @@ void ScheduleCommon::customEvent(QEvent *event)
             }
             else if (resulttext == tr("Stop this recording"))
             {
-                RemoteStopRecording(&recInfo);
+                ProgramInfo pginfo(
+                    recInfo.GetChanID(), recInfo.GetRecordingStartTime());
+                if (pginfo.GetChanID())
+                    RemoteStopRecording(&pginfo);
             }
             else if (resulttext == tr("Modify recording options") ||
                      resulttext == tr("Add override rule"))