summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Engel <dengel@mythtv.org>2010-12-13 21:04:47 (GMT)
committer David Engel <dengel@mythtv.org>2010-12-13 21:07:13 (GMT)
commit52f8df1d2259770da472f4d7608f9b22d59bb694 (patch)
tree8fe834f158a57481d6cc50bbe1c640a0b79a08eb
parent4e4653fa63833b76092c1c956827348472799a2c (diff)
Backport to fixes/0.24.
Fix delete and allow-rerecord when AutoExpireInsteadOfDelete is enabled. When the forget history logic was moved to the backend to fix a race condition, the AutoExpireInsteadOfDelete case was not handled. Fixes #9360.
-rw-r--r--mythtv/programs/mythbackend/mainserver.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/mythtv/programs/mythbackend/mainserver.cpp b/mythtv/programs/mythbackend/mainserver.cpp
index 2a4153d..ffa73c0 100644
--- a/mythtv/programs/mythbackend/mainserver.cpp
+++ b/mythtv/programs/mythbackend/mainserver.cpp
@@ -2380,6 +2380,8 @@ void MainServer::DoHandleDeleteRecording(
recinfo.SaveAutoExpire(kDeletedAutoExpire, true);
if (recinfo.GetRecordingStatus() == rsRecording)
DoHandleStopRecording(recinfo, NULL);
+ if (forgetHistory)
+ recinfo.ForgetHistory();
QStringList outputlist( QString::number(0) );
SendResponse(pbssock, outputlist);
return;