Windows. Remove CWD from DLL search paths.

Signed-off-by: alex-z <blackslayer4@gmail.com>

diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp
index b706a382bcec2647de7fbdf791d1941e76bceafd..3a399655aa0eb9eb461b26c71a49fd804b9d37a9 100644 (file)
--- a/src/cmd/cmd.cpp
+++ b/src/cmd/cmd.cpp
@@ -310,6 +310,9 @@ void selectiveSyncFixup(OCC::SyncJournalDb *journal, const QStringList &newList)
 
 int main(int argc, char **argv)
 {
+#ifdef Q_OS_WIN
+    SetDllDirectory(L"");
+#endif
     QCoreApplication app(argc, argv);
 
 #ifdef Q_OS_WIN

diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 47421220be417384678762a5aa37353ee7e56d9c..df7279308c28070668eeac0c60159616faf55286 100644 (file)
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -57,6 +57,9 @@ void warnSystray()
 
 int main(int argc, char **argv)
 {
+#ifdef Q_OS_WIN
+    SetDllDirectory(L"");
+#endif
     Q_INIT_RESOURCE(resources);
     Q_INIT_RESOURCE(theme);