Fix automation processing priority

Fixes regression from 75077f6200 that caused
global automation tracks to have priority in processing.

Adds a test checking for the desired behaviour.

Fixes #4268
This commit is contained in:
Lukas W
2018-06-01 13:53:14 +02:00
parent 1349d45d72
commit d3c90a81b9
2 changed files with 25 additions and 1 deletions

View File

@@ -816,7 +816,7 @@ AutomationPattern * Song::tempoAutomationPattern()
AutomatedValueMap Song::automatedValuesAt(MidiTime time, int tcoNum) const
{
return TrackContainer::automatedValuesFromTracks(TrackList(tracks()) << m_globalAutomationTrack, time, tcoNum);
return TrackContainer::automatedValuesFromTracks(TrackList{m_globalAutomationTrack} << tracks(), time, tcoNum);
}