Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-06-09 08:32:33 +02:00
Code Issues Projects Releases Wiki Activity

Resolved conflict in 'ChangeLog'

Browse Source
This commit is contained in:
Fred Gleason 2018-10-16 16:35:24 -04:00
commit 1125668208
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -17642,6 +17642,7 @@
2018-09-20 Fred Gleason <fredg@paravelsystems.com>
* Corrected an omission in the documentation of the
'Start Button' ['PB'] RML.
<<<<<<< HEAD
2018-10-01 Fred Gleason <fredg@paravelsystems.com>
* Applied a PR from Patrick Linstruth <patrick@deltecent.com> that
fixed a regression where the 'Stop' button would fail to function
@ -17773,3 +17774,5 @@
* Replaced listings of the 'rd_cut' structure with a reference
to the rd_listcartcuts(7) man page in the rd_listcut(7) and
rd_listcuts(7) man pages.
2018-10-04 Patrick Linstruth <patrick@deltecent.com>
* Added exit logging to rdxport.cgi.

4
web/rdxport/rdxport.cpp
View File

@ -447,6 +447,10 @@ void Xport::XmlExit(const QString &str,int code,const QString &srcfile,
if(xport_post!=NULL) {
delete xport_post;
}
if(code>=400) {
rda->log(RDConfig::LogErr,QString().sprintf("%s '%s' %s",(const char *)str,(const char *)srcfile,
(srcline>0)?(const char *)QString().sprintf("line %d",srcline):""));
}
#ifdef RDXPORT_DEBUG
if(srcline>0) {
RDXMLResult(str+" \""+srcfile+"\" "+QString().sprintf("line %d",srcline),