Merge remote-tracking branch 'origin/Develop' into archive_conflicts_2

1 files changed, 17 insertions, 1 deletions

diff --git a/src/usvfsconnector.cpp b/src/usvfsconnector.cpp
index ef7314c0..5ad19fb0 100644
--- a/src/usvfsconnector.cpp
+++ b/src/usvfsconnector.cpp
@@ -138,6 +138,8 @@ UsvfsConnector::UsvfsConnector()
     BlacklistExecutable(buf.data());
   }
 
+  ClearLibraryForceLoads();
+
   m_LogWorker.moveToThread(&m_WorkerThread);
 
   connect(&m_WorkerThread, SIGNAL(started()), &m_LogWorker, SLOT(process()));
@@ -203,7 +205,8 @@ void UsvfsConnector::updateMapping(const MappingType &mapping)
   */
 }
 
-void UsvfsConnector::updateParams(int logLevel, int crashDumpsType, QString executableBlacklist) {
+void UsvfsConnector::updateParams(int logLevel, int crashDumpsType, QString executableBlacklist) 
+{
   USVFSUpdateParams(::logLevel(logLevel), ::crashDumpsType(crashDumpsType));
   ClearExecutableBlacklist();
   for (auto exec : executableBlacklist.split(";")) {
@@ -211,3 +214,16 @@ void UsvfsConnector::updateParams(int logLevel, int crashDumpsType, QString exec
     BlacklistExecutable(buf.data());
   }
 }
+
+void UsvfsConnector::updateForcedLibraries(const QList<MOBase::ExecutableForcedLoadSetting> &forcedLibraries)
+{
+  ClearLibraryForceLoads();
+  for (auto setting : forcedLibraries) {
+    if (setting.enabled()) {
+      ForceLoadLibrary(
+        setting.process().toStdWString().data(),
+        setting.library().toStdWString().data()
+      );
+    }
+  }
+}