diff options
| author | allexzander <allexzander@users.noreply.github.com> | 2021-10-19 10:27:28 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-19 10:27:28 +0300 |
| commit | 426fd2238d5481f20ea373d3e0e352409c36aac7 (patch) | |
| tree | 2da2c92d21a6798dcca0e28562f5552154b29321 | |
| parent | fb74fdf114999375f4c8aef6b41fcd20ca3367d3 (diff) | |
| parent | bd731a9cda379ff21faf442ef9e774746350eaef (diff) | |
Merge pull request #3901 from nextcloud/bugfix/win-remove-cwd-from-dll-search-path
Windows. Remove CWD from DLL search paths.
| -rw-r--r-- | src/cmd/cmd.cpp | 3 | ||||
| -rw-r--r-- | src/gui/main.cpp | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp index b706a382b..3a399655a 100644 --- 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 47421220b..df7279308 100644 --- 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); |