From 397936b8cf96dea6056ac582564fd311f6ae1180 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Fri, 8 May 2015 09:41:31 -0500 Subject: [PATCH] loadByPath should load DynamicLibrary if they're not already loaded --- src/PluginManager.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/PluginManager.cpp b/src/PluginManager.cpp index 6bfeea93d3..90013271df 100644 --- a/src/PluginManager.cpp +++ b/src/PluginManager.cpp @@ -330,8 +330,10 @@ bool PluginManager::loadByPath(const std::string& pluginPath, boost::filesystem::path path(pluginPath); std::string pathname = Utils::tolower(path.filename().string()); + // If we are a valid type, and we're not yet already + // loaded in the LibraryMap, load it. if (pluginTypeValid(pathname, type) && - m_dynamicLibraryMap.find(path.string()) != m_dynamicLibraryMap.end()) + m_dynamicLibraryMap.find(path.string()) == m_dynamicLibraryMap.end()) { std::string errorString; auto completePath(boost::filesystem::complete(path).string());