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:04:47 (GMT)
commit0cab1df4f13a51aa887e47fc1d79daeb3e316c39 (patch)
tree00a2194a6bbf683a9ed28e7c4c9f375582597da2
parentc5907af68f9ab0b3b74790f8c0713085fc5a43fd (diff)
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 7166709..9371578 100644
--- a/mythtv/programs/mythbackend/mainserver.cpp
+++ b/mythtv/programs/mythbackend/mainserver.cpp
@@ -2393,6 +2393,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;