From c8e07653daab1b8d5e77aada9ed9a351907c71f1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 28 Jun 2010 01:12:21 +0000 Subject: [PATCH] Fix a couple of crashes on MIDI import. git-svn-id: svn://localhost/ardour2/branches/3.0@7308 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/midi_region.cc | 4 ++++ libs/ardour/smf_source.cc | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc index aad4bdfc67..c65758b01e 100644 --- a/libs/ardour/midi_region.cc +++ b/libs/ardour/midi_region.cc @@ -272,6 +272,10 @@ MidiRegion::switch_source(boost::shared_ptr src) void MidiRegion::model_changed () { + if (!model()) { + return; + } + /* build list of filtered Parameters, being those whose automation state is not `Play' */ _filtered_parameters.clear (); diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc index bf038326d5..5fef5f74a6 100644 --- a/libs/ardour/smf_source.cc +++ b/libs/ardour/smf_source.cc @@ -388,7 +388,10 @@ SMFSource::mark_streaming_write_completed () return; } - _model->set_edited(false); + if (_model) { + _model->set_edited(false); + } + Evoral::SMF::end_write (); }