summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mir_app/src/newplugins.cpp14
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;
}