diff options
| author | David Robillard <d@drobilla.net> | 2015-01-12 02:03:49 -0500 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2015-01-12 02:03:49 -0500 |
| commit | 4438263d4d0168581329952a995d0c5887d7f7d2 (patch) | |
| tree | 68d876fccd8c08a74c3fea34acc46540d41c5ebe | |
| parent | 1df6931e77d1fb90202fb48f7d7288e5cb6a6404 (diff) | |
Fix crash when undoing note delete.
| -rw-r--r-- | gtk2_ardour/midi_region_view.cc | 5 | ||||
| -rw-r--r-- | gtk2_ardour/midi_region_view.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 6e257cc0ee..23c761178c 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -1222,7 +1222,7 @@ MidiRegionView::redisplay_model() } else { - add_note (note, visible); + cne = add_note (note, visible); } set<boost::shared_ptr<NoteType> >::iterator it; @@ -1794,7 +1794,7 @@ MidiRegionView::update_hit (Hit* ev, bool update_ghost_regions) * notes, and resolve_note should be called when the corresponding note off * event arrives, to properly display the note. */ -void +NoteBase* MidiRegionView::add_note(const boost::shared_ptr<NoteType> note, bool visible) { NoteBase* event = 0; @@ -1852,6 +1852,7 @@ MidiRegionView::add_note(const boost::shared_ptr<NoteType> note, bool visible) MidiStreamView* const view = mtv->midi_view(); view->update_note_range (note->note()); + return event; } void diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h index 6ffdf98c25..1cfefa9aff 100644 --- a/gtk2_ardour/midi_region_view.h +++ b/gtk2_ardour/midi_region_view.h @@ -119,7 +119,7 @@ public: GhostRegion* add_ghost (TimeAxisView&); - void add_note(const boost::shared_ptr<NoteType> note, bool visible); + NoteBase* add_note(const boost::shared_ptr<NoteType> note, bool visible); void resolve_note(uint8_t note_num, Evoral::Beats end_time); void cut_copy_clear (Editing::CutCopyOp); |