# HG changeset patch
# User Chris Cannam
# Date 1528713251 -3600
# Node ID c014839f49c79253cc2f75418c5c261c9a574ee9
# Parent  75fe1c1e003fd9a3a3553e48881ee05393f49e15
Record path associated with first helper found for a plugin, not last (so native helper in preference to 32-bit helper). Also more debug output

diff -r 75fe1c1e003f -r c014839f49c7 plugin/PiperVampPluginFactory.cpp
--- a/plugin/PiperVampPluginFactory.cpp	Fri Jun 08 14:30:33 2018 +0100
+++ b/plugin/PiperVampPluginFactory.cpp	Mon Jun 11 11:34:11 2018 +0100
@@ -217,7 +217,10 @@
             string soname = QFileInfo(c.libraryPath).baseName().toStdString();
             SVDEBUG << "INFO: For tag \"" << tag << "\" giving library " << soname << endl;
             from.push_back(soname);
-            m_libraries[QString::fromStdString(soname)] = c.libraryPath;
+            QString qsoname = QString::fromStdString(soname);
+            if (m_libraries.find(qsoname) == m_libraries.end()) {
+                m_libraries[qsoname] = c.libraryPath;
+            }
         }
     }
 
diff -r 75fe1c1e003f -r c014839f49c7 plugin/PluginPathSetter.cpp
--- a/plugin/PluginPathSetter.cpp	Fri Jun 08 14:30:33 2018 +0100
+++ b/plugin/PluginPathSetter.cpp	Mon Jun 11 11:34:11 2018 +0100
@@ -252,6 +252,10 @@
         m_originalEnvValues[envVariable] = QString::fromStdString(currentValue);
         if (currentValue != "" && p.second.useEnvVariable) {
             // don't override
+            SVDEBUG << "PluginPathSetter: for environment variable "
+                    << envVariable << ", useEnvVariable setting is false; "
+                    << "leaving current value alone: it is \""
+                    << currentValue << "\"" << endl;
             continue;
         }
         QString separator =
@@ -262,6 +266,12 @@
 #endif
             ;
         QString proposedValue = p.second.directories.join(separator);
+        SVDEBUG << "PluginPathSetter: for environment variable "
+                << envVariable << ", useEnvVariable setting is true or "
+                << "variable is currently unset; "
+                << "changing value from \"" << currentValue
+                << "\" to setting preference of \"" << proposedValue
+                << "\"" << endl;
         putEnvUtf8(envVarStr, proposedValue.toStdString());
     }
 }