fix incorrect design of abort-tempo-map-edit operation
This commit is contained in:
parent
4eb58e104c
commit
fa78fe1f33
@ -3340,14 +3340,6 @@ TempoMarkerDrag::aborted (bool moved)
|
||||
*/
|
||||
|
||||
_editor->abort_tempo_map_edit ();
|
||||
|
||||
// _point->end_float ();
|
||||
_marker->set_position (timepos_t (_marker->tempo ().beats ()));
|
||||
|
||||
if (moved) {
|
||||
// delete the dummy (hidden) marker we used for events while moving.
|
||||
delete _marker;
|
||||
}
|
||||
}
|
||||
|
||||
/********* */
|
||||
|
@ -847,12 +847,7 @@ Editor::abort_tempo_map_edit ()
|
||||
{
|
||||
/* this drops the lock held while we have a writable copy in our per-thread pointer */
|
||||
TempoMap::abort_update ();
|
||||
|
||||
/* Now update our own per-thread copy of the tempo map pointer to be
|
||||
the canonical one, and reconnect markers with elements of that map
|
||||
*/
|
||||
TempoMap::SharedPtr tmap (TempoMap::fetch());
|
||||
reassociate_metric_markers (tmap);
|
||||
tempo_map_changed ();
|
||||
}
|
||||
|
||||
void
|
||||
|
Loading…
Reference in New Issue
Block a user