From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Thu, 19 Sep 2024 07:08:30 +0000 (+0800)
Subject: If using multi-server override url and forcing it then provide combo box selection... 
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~5^2~175^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5c08e4501986a952ab3afa2cc96343c719860858;p=nextcloud-desktop.git

If using multi-server override url and forcing it then provide combo box selection url as url in setup page

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---

diff --git a/src/gui/wizard/owncloudsetuppage.cpp b/src/gui/wizard/owncloudsetuppage.cpp
index 4656d1947..b213fbb03 100644
--- a/src/gui/wizard/owncloudsetuppage.cpp
+++ b/src/gui/wizard/owncloudsetuppage.cpp
@@ -240,8 +240,12 @@ int OwncloudSetupPage::nextId() const
 
 QString OwncloudSetupPage::url() const
 {
-    QString url = _ui.leUrl->fullText().simplified();
-    return url;
+    const auto theme = Theme::instance();
+    if (theme->multipleOverrideServers() && theme->forceOverrideServerUrl()) {
+        return _ui.comboBox->currentData().toString();
+    } else {
+        return _ui.leUrl->fullText().simplified();
+    }
 }
 
 bool OwncloudSetupPage::validatePage()