"cancel" only cancels [new VST] discovery, not index-cache-reading

This commit is contained in:
Robin Gareus 2014-02-26 20:53:42 +01:00
parent 832e02a711
commit 00b9774671

View file

@ -672,9 +672,8 @@ PluginManager::windows_vst_discover_from_path (string path, bool cache_only)
if (plugin_objects) { if (plugin_objects) {
for (x = plugin_objects->begin(); x != plugin_objects->end (); ++x) { for (x = plugin_objects->begin(); x != plugin_objects->end (); ++x) {
if (cancelled()) break; ARDOUR::PluginScanMessage(_("VST"), **x, !cache_only && !cancelled());
ARDOUR::PluginScanMessage(_("VST"), **x, !cache_only); windows_vst_discover (**x, cache_only || cancelled());
windows_vst_discover (**x, cache_only);
} }
vector_delete (plugin_objects); vector_delete (plugin_objects);
@ -795,9 +794,8 @@ PluginManager::lxvst_discover_from_path (string path, bool cache_only)
if (plugin_objects) { if (plugin_objects) {
for (x = plugin_objects->begin(); x != plugin_objects->end (); ++x) { for (x = plugin_objects->begin(); x != plugin_objects->end (); ++x) {
if (cancelled()) break; ARDOUR::PluginScanMessage(_("LXVST"), **x, !cache_only && !cancelled());
ARDOUR::PluginScanMessage(_("LXVST"), **x, !cache_only); lxvst_discover (**x, cache_only || cancelled());
lxvst_discover (**x, cache_only);
} }
vector_delete (plugin_objects); vector_delete (plugin_objects);