smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 14:54:56 +01:00
Code Issues Projects Releases Wiki Activity

Fix occasional crash when saving MIDI.

Browse source 
I can't figure out why a change has a NULL note; that shouldn't happen, but it
does.  Worse case scenario is some undo loss, so better to print something
informative and soldier on than crash.  Hopefully this will help track down the
real cause with more testing.
This commit is contained in:
David Robillard 2014-12-29 22:01:41 -05:00
parent ee8dbdb009
commit 54c085d931
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libs/ardour/midi_model.cc
View file

@ -582,8 +582,16 @@ MidiModel::NoteDiffCommand::marshal_change (const NoteChange& change)
} }
ostringstream id_str; ostringstream id_str;
if (change.note) {
id_str << change.note->id(); id_str << change.note->id();
xml_change->add_property ("id", id_str.str()); xml_change->add_property ("id", id_str.str());
} else if (change.note_id) {
warning << _("Change has no note, using note ID") << endmsg;
id_str << change.note_id;
xml_change->add_property ("id", id_str.str());
} else {
error << _("Change has no note or note ID") << endmsg;
}
return *xml_change; return *xml_change;
} }
@ -593,6 +601,7 @@ MidiModel::NoteDiffCommand::unmarshal_change (XMLNode *xml_change)
{ {
XMLProperty* prop; XMLProperty* prop;
NoteChange change; NoteChange change;
change.note_id = 0;
if ((prop = xml_change->property("property")) != 0) { if ((prop = xml_change->property("property")) != 0) {
change.property = (Property) string_2_enum (prop->value(), change.property); change.property = (Property) string_2_enum (prop->value(), change.property);