Merge pull request #586 from ModOrganizer2/Develop

Release 2.1.6

1 files changed, 11 insertions, 2 deletions

diff --git a/src/usvfsconnector.cpp b/src/usvfsconnector.cpp
index 4ffc81c0..9c81d0d9 100644
--- a/src/usvfsconnector.cpp
+++ b/src/usvfsconnector.cpp
@@ -132,7 +132,11 @@ UsvfsConnector::UsvfsConnector()
 
   CreateVFS(&params);
 
-  BlacklistExecutable(L"TSVNCache.exe");
+  ClearExecutableBlacklist();
+  for (auto exec : Settings::instance().executablesBlacklist().split(";")) {
+    std::wstring buf = exec.toStdWString();
+    BlacklistExecutable(buf.data());
+  }
 
   m_LogWorker.moveToThread(&m_WorkerThread);
 
@@ -199,6 +203,11 @@ void UsvfsConnector::updateMapping(const MappingType &mapping)
   */
 }
 
-void UsvfsConnector::updateParams(int logLevel, int crashDumpsType) {
+void UsvfsConnector::updateParams(int logLevel, int crashDumpsType, QString executableBlacklist) {
   USVFSUpdateParams(::logLevel(logLevel), ::crashDumpsType(crashDumpsType));
+  ClearExecutableBlacklist();
+  for (auto exec : executableBlacklist.split(";")) {
+    std::wstring buf = exec.toStdWString();
+    BlacklistExecutable(buf.data());
+  }
 }