Skip to content
Snippets Groups Projects
Commit 82647698 authored by moenck's avatar moenck
Browse files

Automatically adding DLL path

parent 98a99c3f
Branches
No related tags found
No related merge requests found
Pipeline #12560 passed
...@@ -218,14 +218,14 @@ bool PluginLoader::loadPluginFromFilename(QString const& filename) ...@@ -218,14 +218,14 @@ bool PluginLoader::loadPluginFromFilename(QString const& filename)
{ {
bool retval = false; bool retval = false;
if (m_PluginLoader->isLoaded()) { if (m_PluginLoader->isLoaded()) {
m_PluginLoader->unload(); m_PluginLoader->unload();
} }
bool isLib = QLibrary::isLibrary(filename); bool isLib = QLibrary::isLibrary(filename);
if (isLib) { if (isLib) {
auto oldPath = PluginLoader::addDllPath(filename.toStdString());
m_PluginLoader->setFileName(filename); m_PluginLoader->setFileName(filename);
readMetaDataFromPlugin(); readMetaDataFromPlugin();
...@@ -237,7 +237,9 @@ bool PluginLoader::loadPluginFromFilename(QString const& filename) ...@@ -237,7 +237,9 @@ bool PluginLoader::loadPluginFromFilename(QString const& filename)
if (!m_PluginLoader->isLoaded()) if (!m_PluginLoader->isLoaded())
{ {
qWarning() << ss.c_str(); qWarning() << ss.c_str();
retval = false;
} }
PluginLoader::delDllPath(oldPath);
} }
else { else {
retval = false; retval = false;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment