Skip to content

Commit f8107ed

Browse files
committed
Do not check for matching override server url when there are multiple servers.
Signed-off-by: Camila Ayres <[email protected]>
1 parent 8cbe5e9 commit f8107ed

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/gui/accountmanager.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -244,14 +244,15 @@ bool AccountManager::restoreFromLegacySettings()
244244
const auto cleanOverrideUrl = overrideUrl.endsWith('/') ? overrideUrl.chopped(1) : overrideUrl;
245245
qCInfo(lcAccountManager) << "Migrate: overrideUrl" << cleanOverrideUrl;
246246

247-
if (!cleanOverrideUrl.isEmpty()) {
247+
if (!cleanOverrideUrl.isEmpty() && !Theme::instance()->multipleOverrideServers()) {
248248
oCSettings->beginGroup(QLatin1String(accountsC));
249249
const auto accountsChildGroups = oCSettings->childGroups();
250250
for (const auto &accountId : accountsChildGroups) {
251251
oCSettings->beginGroup(accountId);
252252
const auto oCUrl = oCSettings->value(QLatin1String(urlC)).toString();
253253
const auto cleanOCUrl = oCUrl.endsWith('/') ? oCUrl.chopped(1) : oCUrl;
254254

255+
255256
// in case the urls are equal reset the settings object to read from
256257
// the ownCloud settings object
257258
qCInfo(lcAccountManager) << "Migrate oC config if " << cleanOCUrl << " == " << cleanOverrideUrl << ":"

0 commit comments

Comments
 (0)