]> git.vomp.tv Git - vompserver.git/commitdiff
Check timers before deleting a recording
authorChris Tallon <chris@vomp.tv>
Fri, 21 Apr 2006 16:36:24 +0000 (16:36 +0000)
committerChris Tallon <chris@vomp.tv>
Fri, 21 Apr 2006 16:36:24 +0000 (16:36 +0000)
mvpclient.c

index bedcd240ade1724065a5113fd8c8703a913112d8..be0a8efc44ff8259d5274000b77b6b7233ef425d 100644 (file)
@@ -20,6 +20,9 @@
 
 #include "mvpclient.h"
 
+// This is here else it causes compile errors with something in libdvbmpeg
+#include <vdr/menu.h>
+
 MVPClient::MVPClient(int tsocket)
  : tcp(tsocket)
 {
@@ -335,12 +338,27 @@ int MVPClient::processDeleteRecording(UCHAR* data, int length)
   if (recording)
   {
     log->log("Client", Log::DEBUG, "deleting recording: %s", recording->Name());
-    recording->Delete();
-    sendULONG(1);
+
+    cRecordControl *rc = cRecordControls::GetRecordControl(recording->FileName());
+    if (!rc)
+    {
+      if (recording->Delete())
+      {
+        sendULONG(1);
+      }
+      else
+      {
+        sendULONG(2);
+      }
+    }
+    else
+    {
+      sendULONG(3);
+    }
   }
   else
   {
-    sendULONG(0);
+    sendULONG(4);
   }
 
   return 1;