mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-10-11 17:13:47 +02:00
Merged v2.19
This commit is contained in:
@@ -928,6 +928,14 @@ bool RDEventLine::linkLog(RDLogEvent *e,const QString &svcname,
|
||||
delete logline;
|
||||
logline=NULL;
|
||||
|
||||
//
|
||||
// Clear Leading Event Values
|
||||
//
|
||||
time_type=RDLogLine::Relative;
|
||||
trans_type=event_default_transtype;
|
||||
// time=time.addMSecs(length);
|
||||
grace_time=-1;
|
||||
|
||||
//
|
||||
// Calculate Event Time Boundaries
|
||||
//
|
||||
@@ -1104,15 +1112,17 @@ bool RDEventLine::linkLog(RDLogEvent *e,const QString &svcname,
|
||||
logline->setCartNumber(q->value(0).toUInt());
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
//
|
||||
// Clear Leading Event Values
|
||||
//
|
||||
time_type=RDLogLine::Relative;
|
||||
trans_type=event_default_transtype;
|
||||
*/
|
||||
time=time.addMSecs(length);
|
||||
/*
|
||||
grace_time=-1;
|
||||
|
||||
*/
|
||||
}
|
||||
delete q;
|
||||
|
||||
|
Reference in New Issue
Block a user