зеркало из https://github.com/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>
This commit is contained in:
Родитель
6358f00263
Коммит
5c08e45019
|
@ -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()
|
||||
|
|
Загрузка…
Ссылка в новой задаче