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

Fixed conflict in 'ChangeLog'

Browse Source
This commit is contained in:
Fred Gleason 2020-04-08 17:46:52 -04:00
commit c1f44c8a3f
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -19754,3 +19754,6 @@
in an imported set to fail receive the proper time and transition
type if the 'Include Import Markers in Finished Logs' checkbox in
rdadmin(1) had not been ticked.
2020-04-08 David Klann <dklann@linux.com>
* Fixed a regression in rdexport(1) that caused exported file
names to be constructed improperly.

1
lib/rdlog_line.cpp
View File

@ -2038,6 +2038,7 @@ void RDLogLine::loadCart(int cartnum,int cutnum)
log_average_segue_length=segueStartPoint(RDLogLine::AutoPointer)-
startPoint(RDLogLine::AutoPointer);
}
log_cut_number=cutnum;
log_outcue=q->value(10).toString();
log_isrc=q->value(11).toString();
log_isci=q->value(12).toString();