13
0

merge fix again

This commit is contained in:
Ben Loftis 2015-07-16 17:14:14 -05:00
parent 46c8369328
commit 9673e6b271

View File

@ -7421,9 +7421,9 @@ Editor::remove_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt,
if (tempo_too) {
XMLNode& before (_session->tempo_map().get_state());
if (_session->tempo_map().cut_time (pos, frames) ) {
if (_session->tempo_map().remove_time (pos, frames) ) {
if (!in_command) {
begin_reversible_command (_("cut time"));
begin_reversible_command (_("remove time"));
in_command = true;
}
XMLNode& after (_session->tempo_map().get_state());