File tree 1 file changed +2
-1
lines changed
1 file changed +2
-1
lines changed Original file line number Diff line number Diff line change @@ -244,14 +244,15 @@ bool AccountManager::restoreFromLegacySettings()
244
244
const auto cleanOverrideUrl = overrideUrl.endsWith (' /' ) ? overrideUrl.chopped (1 ) : overrideUrl;
245
245
qCInfo (lcAccountManager) << " Migrate: overrideUrl" << cleanOverrideUrl;
246
246
247
- if (!cleanOverrideUrl.isEmpty ()) {
247
+ if (!cleanOverrideUrl.isEmpty () && ! Theme::instance ()-> multipleOverrideServers () ) {
248
248
oCSettings->beginGroup (QLatin1String (accountsC));
249
249
const auto accountsChildGroups = oCSettings->childGroups ();
250
250
for (const auto &accountId : accountsChildGroups) {
251
251
oCSettings->beginGroup (accountId);
252
252
const auto oCUrl = oCSettings->value (QLatin1String (urlC)).toString ();
253
253
const auto cleanOCUrl = oCUrl.endsWith (' /' ) ? oCUrl.chopped (1 ) : oCUrl;
254
254
255
+
255
256
// in case the urls are equal reset the settings object to read from
256
257
// the ownCloud settings object
257
258
qCInfo (lcAccountManager) << " Migrate oC config if " << cleanOCUrl << " == " << cleanOverrideUrl << " :"
You can’t perform that action at this time.
0 commit comments