Restore "Don't record" option for conflicting programs.

As pointed out by George Nassas, it is sometimes convenient to set conflicts to don't record to make it easier to find later conflicts.
MythTV · Aug 6, 2013 · cff300c · cff300c
1 parent 03a7667
commit cff300c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/mythtv/programs/mythfrontend/schedulecommon.cpp b/mythtv/programs/mythfrontend/schedulecommon.cpp
@@ -355,7 +355,8 @@ void ScheduleCommon::EditRecording(ProgramInfo *pginfo)
              recinfo.GetRecordingStatus() == rsOtherShowing))
         {
             if (recinfo.GetRecordingStatus() == rsWillRecord ||
-                recinfo.GetRecordingStatus() == rsOtherShowing)
+                recinfo.GetRecordingStatus() == rsOtherShowing ||
+                recinfo.GetRecordingStatus() == rsConflict)
                 menuPopup->AddButton(tr("Don't record this showing"),
                                      qVariantFromValue(recinfo));