diff options
| author | Silarn <jrim@rimpo.org> | 2019-07-03 21:29:22 -0500 |
|---|---|---|
| committer | Silarn <jrim@rimpo.org> | 2019-07-03 21:29:22 -0500 |
| commit | ccc0653ca1a406e6994a17c1f6a01b2b6224c86e (patch) | |
| tree | 89d0588b6ec6f2fe9ff067eeada922e26bffe9fc /src/main.cpp | |
| parent | 3a2f056e8adf07f31ea1f6b2856a6d57da1f4777 (diff) | |
| parent | dfd34bf9c0ad055e76c1b6f272c21eb0d79536ce (diff) | |
Merge branch 'Develop' into qt-5.13
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index 1e60483f..09e27cd8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -432,7 +432,7 @@ void preloadDll(const QString& filename) { qDebug().nospace() << "preloading " << filename; - if (!GetModuleHandleW(filename.toStdWString().c_str())) { + if (GetModuleHandleW(filename.toStdWString().c_str())) { // already loaded, this can happen when "restarting" MO by switching // instances, for example return; @@ -459,8 +459,13 @@ void preloadDll(const QString& filename) void preloadSsl() { - preloadDll("libeay32.dll"); - preloadDll("ssleay32.dll"); +#if Q_PROCESSOR_WORDSIZE == 8 + preloadDll("libcrypto-1_1-x64.dll"); + preloadDll("libssl-1_1-x64.dll"); +#elif Q_PROCESSOR_WORDSIZE == 4 + preloadDll("libcrypto-1_1.dll"); + preloadDll("libssl-1_1.dll"); +#endif } static QString getVersionDisplayString() |