From 82647698deee372ddab3923525de543ee511e9bc Mon Sep 17 00:00:00 2001
From: Hauke Moenck <hauke_moenck@gmx.de>
Date: Mon, 29 Oct 2018 15:13:17 +0100
Subject: [PATCH] Automatically adding DLL path
---
SrcBehaviorLoader/PluginLoader.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/SrcBehaviorLoader/PluginLoader.cpp b/SrcBehaviorLoader/PluginLoader.cpp
index 7af1339..703eaff 100644
--- a/SrcBehaviorLoader/PluginLoader.cpp
+++ b/SrcBehaviorLoader/PluginLoader.cpp
@@ -218,14 +218,14 @@ bool PluginLoader::loadPluginFromFilename(QString const& filename)
{
bool retval = false;
if (m_PluginLoader->isLoaded()) {
-
m_PluginLoader->unload();
}
bool isLib = QLibrary::isLibrary(filename);
if (isLib) {
-
+
+ auto oldPath = PluginLoader::addDllPath(filename.toStdString());
m_PluginLoader->setFileName(filename);
readMetaDataFromPlugin();
@@ -237,7 +237,9 @@ bool PluginLoader::loadPluginFromFilename(QString const& filename)
if (!m_PluginLoader->isLoaded())
{
qWarning() << ss.c_str();
+ retval = false;
}
+ PluginLoader::delDllPath(oldPath);
}
else {
retval = false;
--
GitLab