frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a possible race condition with the SVDRP commands CLRE and PUTE

Browse Source
This commit is contained in:
Klaus Schmidinger
2012-03-04 12:05:56 +01:00
parent f35e4acf88
commit 4bdc69eb92
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
svdrp.c
View File

@@ -10,7 +10,7 @@
* and interact with the Video Disk Recorder - or write a full featured
* graphical interface that sits on top of an SVDRP connection.
*
* $Id: svdrp.c 2.15 2012/02/16 12:38:19 kls Exp $
* $Id: svdrp.c 2.16 2012/03/04 12:05:56 kls Exp $
*/
#include "svdrp.h"
@@ -601,9 +601,13 @@ void cSVDRP::CmdCLRE(const char *Option)
Reply(501, "Undefined channel \"%s\"", Option);
}
else {
cSchedules::ClearAll();
cEitFilter::SetDisableUntil(time(NULL) + EITDISABLETIME);
Reply(250, "EPG data cleared");
if (cSchedules::ClearAll()) {
Reply(250, "EPG data cleared");
cEitFilter::SetDisableUntil(time(NULL) + EITDISABLETIME);
}
else
Reply(451, "Error while clearing EPG data");
}
}
@@ -1600,6 +1604,7 @@ void cSVDRP::Execute(char *Cmd)
Reply(PUTEhandler->Status(), "%s", PUTEhandler->Message());
DELETENULL(PUTEhandler);
}
cEitFilter::SetDisableUntil(time(NULL) + EITDISABLETIME); // re-trigger the timeout, in case there is very much EPG data
return;
}
// skip leading whitespace: