summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2020-04-17 12:38:46 -0600
committerPaul Davis <paul@linuxaudiosystems.com>2020-04-17 12:40:28 -0600
commitfea7834e78bc74e05a3046e29c4d4adfd56726fb (patch)
tree1806f46de594f6dd74b8aeb31393c44ef4623ea8
parent28dd253231f1c2779cce11429ad54559df585ddc (diff)
do not reset import status to cancel for every path imported before starting; fixes failure of cancel to stop import
-rw-r--r--gtk2_ardour/editor_audio_import.cc5
1 files 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<string> paths,
bool replace = false;
- for (vector<string>::iterator a = paths.begin(); a != paths.end(); ++a) {
+ for (vector<string>::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<string> 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;