Fixed conflict in 'ChangeLog'

This commit is contained in:
Fred Gleason 2018-10-18 10:28:17 -04:00
commit 4c4a137c9e
2 changed files with 4 additions and 1 deletions

View File

@ -17825,3 +17825,6 @@
* Added play/stop buttons to cart list in rdlibrary(1)
2018-10-17 Patrick Linstruth <patrick@deltecent.com>
* Added ability to run macros from cart list view in rdlibrary(1)
2018-10-17 Patrick Linstruth <patrick@deltecent.com>
* Fixed bug in rdservice(8) where local maintence process was started
with RDSERVICE_SYSTEMMAINT_ID instead of RDSERVICE_LOCALMAINT_ID.

View File

@ -93,7 +93,7 @@ void MainObject::RunSystemMaintRoutine()
void MainObject::RunLocalMaintRoutine()
{
RunEphemeralProcess(RDSERVICE_SYSTEMMAINT_ID,
RunEphemeralProcess(RDSERVICE_LOCALMAINT_ID,
QString(RD_PREFIX)+"/bin/rdmaint",QStringList());
rda->log(RDConfig::LogInfo,"ran local maintenance routines");