Merge pull request #9362 from nextcloud/backport/9296/stable-3.17

camilasan · web-flow · commit 6cce00344062 · 2026-01-22T11:57:55.000+01:00
[stable-3.17] fix: detect upgrade only scenario.
diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp
@@ -1293,7 +1293,8 @@ bool ConfigFile::isDowngrade() const
 bool ConfigFile::shouldTryUnbrandedToBrandedMigration() const
 {
     return migrationPhase() == ConfigFile::MigrationPhase::SetupFolders
-        && Theme::instance()->appName() != unbrandedAppName;
+        && Theme::instance()->appName() != unbrandedAppName
+        && !discoveredLegacyConfigPath().isEmpty();
 }
 
 bool ConfigFile::isUnbrandedToBrandedMigrationInProgress() const

Original file line number	Diff line number	Diff line change
`@@ -1293,7 +1293,8 @@ bool ConfigFile::isDowngrade() const`
`1293`	`1293`	`bool ConfigFile::shouldTryUnbrandedToBrandedMigration() const`
`1294`	`1294`	`{`
`1295`	`1295`	`return migrationPhase() == ConfigFile::MigrationPhase::SetupFolders`
`1296`		`- && Theme::instance()->appName() != unbrandedAppName;`
	`1296`	`+ && Theme::instance()->appName() != unbrandedAppName`
	`1297`	`+ && !discoveredLegacyConfigPath().isEmpty();`
`1297`	`1298`	`}`
`1298`	`1299`
`1299`	`1300`	`bool ConfigFile::isUnbrandedToBrandedMigrationInProgress() const`