зеркало из https://github.com/nextcloud/desktop.git
Fix logic for initial load of update channels and priority for user with subscription.
Signed-off-by: Camila Ayres <hello@camilasan.com>
This commit is contained in:
Родитель
d0f87c3496
Коммит
a7144ca981
|
@ -293,8 +293,9 @@ void GeneralSettings::loadMiscSettings()
|
|||
#if defined(BUILD_UPDATER)
|
||||
void GeneralSettings::loadUpdateChannelsList() {
|
||||
ConfigFile cfgFile;
|
||||
if (_currentUpdateChannelList != cfgFile.validUpdateChannels() && !cfgFile.serverHasValidSubscription()) {
|
||||
_currentUpdateChannelList = cfgFile.validUpdateChannels();
|
||||
const auto validUpdateChannels = cfgFile.validUpdateChannels();
|
||||
if (_currentUpdateChannelList.isEmpty() || (_currentUpdateChannelList != validUpdateChannels && !cfgFile.serverHasValidSubscription())) {
|
||||
_currentUpdateChannelList = validUpdateChannels;
|
||||
_ui->updateChannel->clear();
|
||||
_ui->updateChannel->addItems(_currentUpdateChannelList);
|
||||
const auto currentUpdateChannelIndex = _currentUpdateChannelList.indexOf(cfgFile.currentUpdateChannel());
|
||||
|
|
Загрузка…
Ссылка в новой задаче