From: Camila Ayres <hello@camilasan.com>
Date: Thu, 17 Oct 2024 14:51:27 +0000 (+0200)
Subject: Do not override the channels list if one of the account has enterprise.
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~5^2~75^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=664a13189b11d05411ce23b481b8d1b9c31e5b89;p=nextcloud-desktop.git

Do not override the channels list if one of the account has enterprise.

Maintain stable and enterprise.

Signed-off-by: Camila Ayres <hello@camilasan.com>
---

diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp
index 264bca62b..1152342ed 100644
--- a/src/gui/generalsettings.cpp
+++ b/src/gui/generalsettings.cpp
@@ -293,7 +293,7 @@ void GeneralSettings::loadMiscSettings()
 #if defined(BUILD_UPDATER)
 void GeneralSettings::loadUpdateChannelsList() {
     ConfigFile cfgFile;
-    if (_currentUpdateChannelList != cfgFile.validUpdateChannels()) {
+    if (_currentUpdateChannelList != cfgFile.validUpdateChannels() && !cfgFile.serverHasValidSubscription()) {
         _currentUpdateChannelList = cfgFile.validUpdateChannels();
         _ui->updateChannel->clear();
         _ui->updateChannel->addItems(_currentUpdateChannelList);