avoid needless errors when redoing an operation involving adding notes that were not added because of overlap exclusion preferences

git-svn-id: svn://localhost/ardour2/branches/3.0@7264 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 6 insertions, 1 deletions

diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc
index bac630bb14..bdf0516dea 100644
--- a/libs/ardour/midi_model.cc
+++ b/libs/ardour/midi_model.cc
@@ -232,7 +232,12 @@ MidiModel::DiffCommand::operator()()
                 MidiModel::WriteLock lock(_model->edit_lock());
 
                 for (NoteList::iterator i = _added_notes.begin(); i != _added_notes.end(); ++i) {
-                        _model->add_note_unlocked(*i);
+                        if (!_model->add_note_unlocked(*i)) {
+                                /* failed to add it, so don't leave it in the removed list, to
+                                   avoid apparent errors on undo.
+                                 */
+                                _removed_notes.remove (*i);
+                        }
                 }
                 
                 for (NoteList::iterator i = _removed_notes.begin(); i != _removed_notes.end(); ++i) {