Merge pull request #7869 from nextcloud/bugfix/update

Hide update channels options when needed.
nextcloud · Feb 18, 2025 · c36b6a7 · c36b6a7
2 parents 826e6cc + 711f983
commit c36b6a7
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp
@@ -326,8 +326,14 @@ void GeneralSettings::loadMiscSettings()
 #if defined(BUILD_UPDATER)
 void GeneralSettings::loadUpdateChannelsList() {
     ConfigFile cfgFile;
+    if (cfgFile.serverHasValidSubscription()) {
+        _ui->updateChannel->hide();
+        _ui->updateChannelLabel->hide();
+        return;
+    }
+
     const auto validUpdateChannels = cfgFile.validUpdateChannels();
-    if (_currentUpdateChannelList.isEmpty() || (_currentUpdateChannelList != validUpdateChannels && !cfgFile.serverHasValidSubscription())) {
+    if (_currentUpdateChannelList.isEmpty() || _currentUpdateChannelList != validUpdateChannels){
         _currentUpdateChannelList = validUpdateChannels;
         _ui->updateChannel->clear();
         _ui->updateChannel->addItems(_currentUpdateChannelList);