Merge pull request #6974 from nextcloud/bugfix/update-channels

Make sure to not repeat the update channels list when loading the settings for a second account.
This commit is contained in:
Matthieu Gallien 2024-08-06 18:34:52 +02:00 committed by GitHub
commit 790f54d2f5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -282,6 +282,7 @@ void GeneralSettings::loadMiscSettings()
#if defined(BUILD_UPDATER) #if defined(BUILD_UPDATER)
const auto validUpdateChannels = cfgFile.validUpdateChannels(); const auto validUpdateChannels = cfgFile.validUpdateChannels();
_ui->updateChannel->clear();
_ui->updateChannel->addItems(validUpdateChannels); _ui->updateChannel->addItems(validUpdateChannels);
const auto currentUpdateChannelIndex = validUpdateChannels.indexOf(cfgFile.currentUpdateChannel()); const auto currentUpdateChannelIndex = validUpdateChannels.indexOf(cfgFile.currentUpdateChannel());
_ui->updateChannel->setCurrentIndex(currentUpdateChannelIndex != -1? currentUpdateChannelIndex : 0); _ui->updateChannel->setCurrentIndex(currentUpdateChannelIndex != -1? currentUpdateChannelIndex : 0);