diff --git a/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp b/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp index eb8a0b037..041503568 100644 --- a/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp +++ b/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp @@ -114,7 +114,7 @@ cleanup: // release all of our handles return machine_type; } -int PluginsManager::loadPlugin(const TCHAR *pluginFilePath, vector & dll2Remove) +int PluginsManager::loadPlugin(const TCHAR *pluginFilePath) { const TCHAR *pluginFileName = ::PathFindFileName(pluginFilePath); if (isInLoadedDlls(pluginFileName)) @@ -269,7 +269,7 @@ int PluginsManager::loadPlugin(const TCHAR *pluginFilePath, vector dllNames; - vector dll2Remove; NppParameters * nppParams = NppParameters::getInstance(); generic_string nppPath = nppParams->getNppPath(); @@ -363,7 +362,7 @@ bool PluginsManager::loadPluginsV2(const TCHAR* dir) for (size_t i = 0, len = dllNames.size(); i < len; ++i) { - loadPlugin(dllNames[i].c_str(), dll2Remove); + loadPlugin(dllNames[i].c_str()); } return true; diff --git a/PowerEditor/src/MISC/PluginsManager/PluginsManager.h b/PowerEditor/src/MISC/PluginsManager/PluginsManager.h index db5a03e39..921aa3e4a 100644 --- a/PowerEditor/src/MISC/PluginsManager/PluginsManager.h +++ b/PowerEditor/src/MISC/PluginsManager/PluginsManager.h @@ -99,7 +99,7 @@ public: _nppData = nppData; } - int loadPlugin(const TCHAR *pluginFilePath, std::vector & dll2Remove); + int loadPlugin(const TCHAR *pluginFilePath); bool loadPluginsV2(const TCHAR *dir = NULL); bool unloadPlugin(int index, HWND nppHandle); diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp index af01f4475..f3cec6c1c 100644 --- a/PowerEditor/src/NppCommands.cpp +++ b/PowerEditor/src/NppCommands.cpp @@ -2437,10 +2437,9 @@ void Notepad_plus::command(int id) vector copiedFiles = addNppComponents(destDir, extFilterName, extFilter); // load plugin - vector dll2Remove; for (size_t i = 0, len = copiedFiles.size() ; i < len ; ++i) { - int index = _pluginsManager.loadPlugin(copiedFiles[i].c_str(), dll2Remove); + int index = _pluginsManager.loadPlugin(copiedFiles[i].c_str()); if (_pluginsManager.getMenuHandle()) _pluginsManager.addInMenuFromPMIndex(index); }