From 0cab1df4f13a51aa887e47fc1d79daeb3e316c39 Mon Sep 17 00:00:00 2001
From: David Engel <dengel@mythtv.org>
Date: Mon, 13 Dec 2010 15:04:47 -0600
Subject: [PATCH] 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.
---
 mythtv/programs/mythbackend/mainserver.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mythtv/programs/mythbackend/mainserver.cpp b/mythtv/programs/mythbackend/mainserver.cpp
index 7166709c181..93715782154 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;