Permalink
Browse files

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.
  • Loading branch information...
1 parent c5907af commit 0cab1df4f13a51aa887e47fc1d79daeb3e316c39 @gigem gigem committed Dec 13, 2010
Showing with 2 additions and 0 deletions.
  1. +2 −0 mythtv/programs/mythbackend/mainserver.cpp
View
2 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;

0 comments on commit 0cab1df

Please sign in to comment.