From fea7834e78bc74e05a3046e29c4d4adfd56726fb Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 17 Apr 2020 12:38:46 -0600 Subject: do not reset import status to cancel for every path imported before starting; fixes failure of cancel to stop import --- gtk2_ardour/editor_audio_import.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index e7b413e804..f65e61d85c 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -384,7 +384,7 @@ Editor::do_import (vector paths, bool replace = false; - for (vector::iterator a = paths.begin(); a != paths.end(); ++a) { + for (vector::iterator a = paths.begin(); a != paths.end() && !import_status.cancel; ++a) { const int check = check_whether_and_how_to_import (*a, true); @@ -552,9 +552,10 @@ Editor::import_sndfiles (vector paths, bool replace, ARDOUR::PluginInfoPtr instrument) { + cerr << "Importing " << paths.size() << " at once\n"; + import_status.paths = paths; import_status.done = false; - import_status.cancel = false; import_status.freeze = false; import_status.quality = quality; import_status.replace_existing_source = replace; -- cgit v1.2.3