diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2020-02-04 15:26:54 +0300 |
---|---|---|
committer | Olivier Goffart <ogoffart@woboq.com> | 2020-02-04 15:26:54 +0300 |
commit | eb86fd3a27b6e396e227fafb018dac686ef7b630 (patch) | |
tree | 299618b88ccd84dea164b0656321f89e99ac1262 /src/gui/sharelinkwidget.cpp | |
parent | 68887c70fc730b31bbd2a80136dcc7566709cfcf (diff) |
Share: Fix merge conflict
Re-apply part of commit f638f3352407b1ab08bb0c4a860f0ac5d4b370b0
(for issue #7429) that were gone in the previous merge
Diffstat (limited to 'src/gui/sharelinkwidget.cpp')
-rw-r--r-- | src/gui/sharelinkwidget.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/gui/sharelinkwidget.cpp b/src/gui/sharelinkwidget.cpp index 47bf2e7cf..75b6b2a11 100644 --- a/src/gui/sharelinkwidget.cpp +++ b/src/gui/sharelinkwidget.cpp @@ -331,18 +331,14 @@ void ShareLinkWidget::slotShareSelectionChanged() // Public upload state (files can only be read-only, box is hidden for them) _ui->widget_editing->setEnabled(!_isFile); if (!selectionUnchanged) { - if (_isFile) { - _ui->radio_readOnly->setChecked(true); - } else { - if (share && share->getPublicUpload()) { - if (share->getShowFileListing()) { - _ui->radio_readWrite->setChecked(true); - } else { - _ui->radio_uploadOnly->setChecked(true); - } + if (share && share->getPublicUpload()) { + if (share->getShowFileListing()) { + _ui->radio_readWrite->setChecked(true); } else { - _ui->radio_readOnly->setChecked(true); + _ui->radio_uploadOnly->setChecked(true); } + } else { + _ui->radio_readOnly->setChecked(true); } } |