Fix for bug #2068 - removing or rescheduling a playlist will still play the playlist because the scheduler is not signalled.
This commit is contained in:
parent
426b40f2ce
commit
b5abe48ea6
|
@ -44,6 +44,7 @@
|
|||
|
||||
#include "ScheduleInterface.h"
|
||||
#include "ScheduleFactory.h"
|
||||
#include "SchedulerDaemon.h"
|
||||
#include "LiveSupport/Core/XmlRpcTools.h"
|
||||
|
||||
#include "RemoveFromScheduleMethod.h"
|
||||
|
@ -135,7 +136,10 @@ RemoveFromScheduleMethod :: execute(XmlRpc::XmlRpcValue & rootParameter,
|
|||
return;
|
||||
}
|
||||
schedule->removeFromSchedule(entryId);
|
||||
|
||||
|
||||
// tell the scheduler daemon to reload the scheduled events
|
||||
Ptr<SchedulerDaemon>::Ref scheduler = SchedulerDaemon::getInstance();
|
||||
scheduler->update();
|
||||
} catch (std::invalid_argument &e) {
|
||||
XmlRpcTools::markError(errorId+3, "schedule entry not found",
|
||||
returnValue);
|
||||
|
|
|
@ -44,6 +44,7 @@
|
|||
|
||||
#include "ScheduleInterface.h"
|
||||
#include "ScheduleFactory.h"
|
||||
#include "SchedulerDaemon.h"
|
||||
#include "LiveSupport/Core/XmlRpcTools.h"
|
||||
|
||||
#include "RescheduleMethod.h"
|
||||
|
@ -153,6 +154,10 @@ RescheduleMethod :: execute(XmlRpc::XmlRpcValue & rootParameter,
|
|||
}
|
||||
try {
|
||||
schedule->reschedule(entryId, playschedule);
|
||||
|
||||
// tell the scheduler daemon to reload the scheduled events
|
||||
Ptr<SchedulerDaemon>::Ref scheduler = SchedulerDaemon::getInstance();
|
||||
scheduler->update();
|
||||
} catch (std::invalid_argument &e) {
|
||||
XmlRpcTools::markError(errorId+5, e.what(),
|
||||
returnValue);
|
||||
|
|
Loading…
Reference in New Issue