From 22135f9f57a35944db6aacd8551807d03e3b00c8 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Tue, 3 Jan 2017 10:37:42 +0100 Subject: [PATCH] Fixup broken authType on load #5408 --- src/gui/accountmanager.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp index 86f5ca256..8e59278ad 100644 --- a/src/gui/accountmanager.cpp +++ b/src/gui/accountmanager.cpp @@ -214,6 +214,17 @@ AccountPtr AccountManager::loadAccountHelper(QSettings& settings) auto acc = createAccount(); QString authType = settings.value(QLatin1String(authTypeC)).toString(); + + // There was an account-type saving bug when 'skip folder config' was used + // See #5408. This attempts to fix up the "dummy" authType + if (authType == QLatin1String("dummy")) { + if (settings.contains(QLatin1String("http_user"))) { + authType = "http"; + } else if (settings.contains(QLatin1String("shibboleth_shib_user"))) { + authType = "shibboleth"; + } + } + QString overrideUrl = Theme::instance()->overrideServerUrl(); QString forceAuth = Theme::instance()->forceConfigAuthType(); if(!forceAuth.isEmpty() && !overrideUrl.isEmpty() ) { -- 2.30.2