ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Insert time: don't unlock markers we're not going to move anyway 

Move checking for locked markers in Editor::insert_time() so it doesn't
happen if we're going to skip the marker because it's glued to musical
time.
This commit is contained in:
Colin Fletcher 2015-06-14 18:09:30 +01:00
parent 34e1e00f8b
commit 292f704b30
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk2_ardour/editor_ops.cc
View File

@ -7030,12 +7030,11 @@ Editor::insert_time (
Locations::LocationList::const_iterator tmp;
bool const was_locked = (*i)->locked ();
if (locked_markers_too) {
(*i)->unlock ();
}
if ((*i)->position_lock_style() == AudioTime || glued_markers_too) {
bool const was_locked = (*i)->locked ();
if (locked_markers_too) {
(*i)->unlock ();
}
if ((*i)->start() >= pos) {
// move end first, in case we're moving by more than the length of the range
@ -7046,10 +7045,9 @@ Editor::insert_time (
moved = true;
}
}
if (was_locked) {
(*i)->lock ();
if (was_locked) {
(*i)->lock ();
}
}
}