diff options
| author | Robin Gareus <robin@gareus.org> | 2014-02-26 20:53:42 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-02-26 20:53:42 +0100 |
| commit | 00b9774671d5ca468c49ceb9c31eeb5dabfe9c39 (patch) | |
| tree | 903438c299e51bbcd18d302fac122380b988f880 /libs/ardour/plugin_manager.cc | |
| parent | 832e02a711f2df5cfd8b0fc72e2d52e524aa6cab (diff) | |
"cancel" only cancels [new VST] discovery, not index-cache-reading
Diffstat (limited to 'libs/ardour/plugin_manager.cc')
| -rw-r--r-- | libs/ardour/plugin_manager.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc index ce9e769d9e..8a66032d71 100644 --- a/libs/ardour/plugin_manager.cc +++ b/libs/ardour/plugin_manager.cc @@ -672,9 +672,8 @@ PluginManager::windows_vst_discover_from_path (string path, bool cache_only) if (plugin_objects) { for (x = plugin_objects->begin(); x != plugin_objects->end (); ++x) { - if (cancelled()) break; - ARDOUR::PluginScanMessage(_("VST"), **x, !cache_only); - windows_vst_discover (**x, cache_only); + ARDOUR::PluginScanMessage(_("VST"), **x, !cache_only && !cancelled()); + windows_vst_discover (**x, cache_only || cancelled()); } vector_delete (plugin_objects); @@ -795,9 +794,8 @@ PluginManager::lxvst_discover_from_path (string path, bool cache_only) if (plugin_objects) { for (x = plugin_objects->begin(); x != plugin_objects->end (); ++x) { - if (cancelled()) break; - ARDOUR::PluginScanMessage(_("LXVST"), **x, !cache_only); - lxvst_discover (**x, cache_only); + ARDOUR::PluginScanMessage(_("LXVST"), **x, !cache_only && !cancelled()); + lxvst_discover (**x, cache_only || cancelled()); } vector_delete (plugin_objects); |