diff options
| author | Robin Gareus <robin@gareus.org> | 2014-09-13 16:34:01 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-09-13 16:53:04 +0200 |
| commit | 009ced96409d1aa7e8999f4c13e7cf60fe2040e2 (patch) | |
| tree | 6605b7517aa8a4ff8a7bce8c443185e01c12e2b7 /gtk2_ardour/editor_audio_import.cc | |
| parent | 07d0f8f1aa5e2639df15a23dde726839cb9b00a4 (diff) | |
fix crash when importing midi files with >1 midi-channel -- fixes #5965
Diffstat (limited to 'gtk2_ardour/editor_audio_import.cc')
| -rw-r--r-- | gtk2_ardour/editor_audio_import.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index 339249260e..313624d21b 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -746,7 +746,12 @@ Editor::add_sources (vector<string> paths, SourceList& sources, framepos_t& pos, region_name = (*x)->name(); } - track_names.push_back (PBD::basename_nosuffix (paths[n])); + if (SMFSource::safe_midi_file_extension (paths.front())) { + string track_name = string_compose ("%1-c%2", PBD::basename_nosuffix (fs->path()), (n + 1)); + track_names.push_back (track_name); + } else { + track_names.push_back (PBD::basename_nosuffix (paths[n])); + } } PropertyList plist; |