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

Fixed conflict in 'ChangeLog'

Browse Source
This commit is contained in:
Fred Gleason 2019-01-14 14:42:02 -05:00
commit cbe479223a
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -18373,3 +18373,6 @@
* Fixed regression in scheduler that caused events with two * Fixed regression in scheduler that caused events with two
scheduler codes to fail. scheduler codes to fail.
* Updated scheduler reports to indicate scheduler codes. * Updated scheduler reports to indicate scheduler codes.
2019-01-14 Patrick Linstruth <patrick@deltecent.com>
* Fixed a bug in RDLogManager that allowed cloned clock lines to pass
hour mark.

3
rdlogmanager/edit_clock.cpp
View File

@ -350,6 +350,9 @@ void EditClock::cloneData()
eventline.setName(selectedEventLine->name()); eventline.setName(selectedEventLine->name());
eventline.setStartTime(selectedEventLine->startTime().addMSecs(selectedEventLine->length())); eventline.setStartTime(selectedEventLine->startTime().addMSecs(selectedEventLine->length()));
eventline.setLength(selectedEventLine->length()); eventline.setLength(selectedEventLine->length());
if(eventline.startTime().addMSecs(eventline.length()).hour()) {
eventline.setLength(0);
}
EditEventLine *edit_eventline= EditEventLine *edit_eventline=
new EditEventLine(&eventline,edit_clock,-1,this); new EditEventLine(&eventline,edit_clock,-1,this);