ardour/livetrax
13
0
Fork 0
Code

Fix 3-point edit undo/redo #9464

Browse Source 
Playlist::split can result in removal of a region
(adding two others instead). In this case the state
of the removed region (if modified) is not saved.
This commit is contained in:
Robin Gareus 2023-10-02 03:13:31 +02:00
parent afa295d4af
commit dfd44c2ebf
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/ardour/session.cc
View File

@ -7279,6 +7279,15 @@ Session::cut_copy_section (timepos_t const& start_, timepos_t const& end_, timep
}
if (op != DeleteSection) {
/* Commit changes so far, to retain undo sequence.
* split() may create a new region replacing the already
* rippled of regions, the length/position of which
* would not be saved/restored.
*/
pl->rdiff_and_add_command (this);
pl->clear_changes ();
pl->clear_owned_changes ();
/* now make space at the insertion-point */
pl->split (to);
pl->ripple (to, start.distance(end), NULL);
@ -7288,13 +7297,10 @@ Session::cut_copy_section (timepos_t const& start_, timepos_t const& end_, timep
pl->paste (p, to, 1);
}
vector<Command*> cmds;
pl->rdiff (cmds);
add_commands (cmds);
add_command (new StatefulDiffCommand (pl));
pl->rdiff_and_add_command (this);
}
for (auto& pl : _playlists->playlists) {
for (auto& pl : playlists) {
pl->thaw ();
}