mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-06-07 15:42:34 +02:00
Merged branch kxxo
This commit is contained in:
commit
979f477e3b
@ -15912,3 +15912,7 @@
|
|||||||
of rdauth(8).
|
of rdauth(8).
|
||||||
2017-07-28 Fred Gleason <fredg@paravelsystems.com>
|
2017-07-28 Fred Gleason <fredg@paravelsystems.com>
|
||||||
* Removed rdauth(8).
|
* Removed rdauth(8).
|
||||||
|
2017-07-28 Fred Gleason <fredg@paravelsystems.com>
|
||||||
|
* Fixed a bug in 'lib/rdevent_line.cpp' that caused an embedded traffic
|
||||||
|
import event to be assigned incorrect link parameters when scheduled
|
||||||
|
at midnight.
|
||||||
|
@ -977,7 +977,7 @@ bool RDEventLine::linkLog(RDLogEvent *e,int next_id,const QString &svcname,
|
|||||||
logline->setTransType(trans_type);
|
logline->setTransType(trans_type);
|
||||||
logline->setEventLength(event_length);
|
logline->setEventLength(event_length);
|
||||||
logline->setLinkEventName(event_nested_event);
|
logline->setLinkEventName(event_nested_event);
|
||||||
if((!q->value(12).isNull())&&(!q->value(13).isNull())) {
|
if(!q->value(13).isNull()) {
|
||||||
logline->setLinkStartTime(q->value(12).toTime());
|
logline->setLinkStartTime(q->value(12).toTime());
|
||||||
logline->setLinkLength(q->value(13).toInt());
|
logline->setLinkLength(q->value(13).toInt());
|
||||||
}
|
}
|
||||||
@ -1040,7 +1040,7 @@ bool RDEventLine::linkLog(RDLogEvent *e,int next_id,const QString &svcname,
|
|||||||
logline->setTransType(trans_type);
|
logline->setTransType(trans_type);
|
||||||
logline->setEventLength(event_length);
|
logline->setEventLength(event_length);
|
||||||
logline->setLinkEventName(event_nested_event);
|
logline->setLinkEventName(event_nested_event);
|
||||||
if((!q->value(12).isNull())&&(!q->value(13).isNull())) {
|
if(!q->value(13).isNull()) {
|
||||||
logline->setLinkStartTime(q->value(12).toTime());
|
logline->setLinkStartTime(q->value(12).toTime());
|
||||||
logline->setLinkLength(q->value(13).toInt());
|
logline->setLinkLength(q->value(13).toInt());
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user