Merged v2.17.0-remerge-fix

This commit is contained in:
Fred Gleason
2017-12-06 13:14:50 -05:00
9 changed files with 187 additions and 10 deletions

View File

@@ -147,8 +147,8 @@ int RunLogOperation(int argc,char *argv[],const QString &svcname,
}
report="";
log->removeTracks(rdstation_conf,rduser,config);
svc->clearLogLinks(RDSvc::Traffic,start_date,logname);
svc->clearLogLinks(RDSvc::Music,start_date,logname);
svc->clearLogLinks(RDSvc::Traffic,logname);
svc->clearLogLinks(RDSvc::Music,logname);
if(svc->linkLog(RDSvc::Music,start_date,logname,&report)) {
printf("%s\n",(const char*)report);
}
@@ -176,7 +176,7 @@ int RunLogOperation(int argc,char *argv[],const QString &svcname,
return 256;
}
report="";
svc->clearLogLinks(RDSvc::Traffic,start_date,logname);
svc->clearLogLinks(RDSvc::Traffic,logname);
if(svc->linkLog(RDSvc::Traffic,start_date,logname,&report)) {
printf("%s\n",(const char*)report);
}