From 009ced96409d1aa7e8999f4c13e7cf60fe2040e2 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 13 Sep 2014 16:34:01 +0200 Subject: fix crash when importing midi files with >1 midi-channel -- fixes #5965 --- gtk2_ardour/editor_audio_import.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gtk2_ardour') 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 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; -- cgit v1.2.3