diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp index 8cc87e61668f0..d31f1b19cc71c 100644 --- a/src/libsync/configfile.cpp +++ b/src/libsync/configfile.cpp @@ -703,7 +703,10 @@ QStringList ConfigFile::validUpdateChannels() const QString ConfigFile::defaultUpdateChannel() const { - if (serverHasValidSubscription() && !Theme::instance()->isBranded()) { + const auto isBranded = Theme::instance()->isBranded(); + auto defaultChannel = defaultUpdateChannelName; + + if (serverHasValidSubscription() && !isBranded) { if (const auto serverChannel = desktopEnterpriseChannel(); validUpdateChannels().contains(serverChannel)) { qCWarning(lcConfigFile()) << "Enforcing update channel" << serverChannel << "because that is the desktop enterprise channel returned by the server."; @@ -712,11 +715,12 @@ QString ConfigFile::defaultUpdateChannel() const } if (const auto currentVersionSuffix = Theme::instance()->versionSuffix(); - validUpdateChannels().contains(currentVersionSuffix)) { + validUpdateChannels().contains(currentVersionSuffix) && !isBranded) { qCWarning(lcConfigFile()) << "Enforcing update channel" << currentVersionSuffix << "because of the version suffix of the current client."; return currentVersionSuffix; } + qCWarning(lcConfigFile()) << "Enforcing default update channel" << defaultUpdateChannelName; return defaultUpdateChannelName; }