Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-20 14:47:52 +02:00
Code Issues Projects Releases Wiki Activity

2018-06-24 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in rdlogmanager(1) that caused a segfault
	when generating a log.
This commit is contained in:
Fred Gleason 2018-08-24 14:48:49 -04:00
parent 4f05308b37
commit 07396cb96d
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -17521,3 +17521,6 @@
* Changed the default value of the 'Collation=' parameter in the
[mySQL] section of rd.conf(5) from 'latin1_swedish_ci' to
'utf8_general_ci'.
2018-06-24 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdlogmanager(1) that caused a segfault
when generating a log.

6
lib/rdevent_line.cpp
View File

@ -522,13 +522,13 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname,
QString().sprintf("EVENT_LENGTH=%d",event_length);
RDSqlQuery::apply(sql);
count++;
time=time.addMSecs(GetLength(q->value(2).toUInt()));
time=time.addMSecs(i_item->cartNumber());
trans_type=event_default_transtype;
time_type=RDLogLine::Relative;
post_point=false;
grace_time=-1;
postimport_length+=GetLength(q->value(2).toUInt());
postimport_length+=GetLength(i_item->cartNumber());
}
//
@ -895,7 +895,7 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname,
QString().sprintf("EVENT_LENGTH=%d",event_length);
RDSqlQuery::apply(sql);
count++;
time=time.addMSecs(GetLength(q->value(2).toUInt()));
time=time.addMSecs(GetLength(i_item->cartNumber()));
time_type=RDLogLine::Relative;
trans_type=event_default_transtype;
post_point=false;