Merge pull request #9296 from nextcloud/bugfix/noid/update

camilasan · web-flow · commit 87dc29c7da99 · 2026-01-12T15:14:40.000+01:00
fix: detect upgrade only scenario.
diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp
@@ -1352,7 +1352,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
`@@ -1352,7 +1352,8 @@ bool ConfigFile::isDowngrade() const`
`1352`	`1352`	`bool ConfigFile::shouldTryUnbrandedToBrandedMigration() const`
`1353`	`1353`	`{`
`1354`	`1354`	`return migrationPhase() == ConfigFile::MigrationPhase::SetupFolders`
`1355`		`- && Theme::instance()->appName() != unbrandedAppName;`
	`1355`	`+ && Theme::instance()->appName() != unbrandedAppName`
	`1356`	`+ && !discoveredLegacyConfigPath().isEmpty();`
`1356`	`1357`	`}`
`1357`	`1358`
`1358`	`1359`	`bool ConfigFile::isUnbrandedToBrandedMigrationInProgress() const`