diff options
| author | MikalaiR <nikolay.romanovich@narod.ru> | 2016-03-26 12:24:39 +0000 |
|---|---|---|
| committer | MikalaiR <nikolay.romanovich@narod.ru> | 2016-03-26 12:24:39 +0000 |
| commit | 38c21ffb3ddc477b4ebed30e2c070617c04a3ee4 (patch) | |
| tree | 05cd15b6a012c91466a8afbac5fa5d98ceb642d2 /src | |
| parent | 81eb3209fdc7cba7a125ac6daacc893e93f22d2b (diff) | |
core: load stdssl if openssl missing
git-svn-id: http://svn.miranda-ng.org/main/trunk@16547 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src')
| -rw-r--r-- | src/mir_app/src/newplugins.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/mir_app/src/newplugins.cpp b/src/mir_app/src/newplugins.cpp index d640e9df1b..3aa9bcec53 100644 --- a/src/mir_app/src/newplugins.cpp +++ b/src/mir_app/src/newplugins.cpp @@ -731,18 +731,22 @@ void EnsureCheckerLoaded(bool bEnable) int LoadSslModule(void)
{
- if (plugin_ssl != NULL) {
- if (!TryLoadPlugin(plugin_ssl, false)) {
+ bool bExtSSLLoaded = false;
+
+ if (plugin_ssl != NULL)
+ {
+ if (!TryLoadPlugin(plugin_ssl, false))
+ {
Plugin_Uninit(plugin_ssl);
- return 1;
}
+ bExtSSLLoaded = true;
}
- else {
+ if (!bExtSSLLoaded)
+ {
MuuidReplacement stdSsl = { MIID_SSL, _T("stdssl"), NULL };
if (!LoadCorePlugin(stdSsl))
return 1;
}
-
mir_getSI(&sslApi);
return 0;
}
|