Skip to content

Commit

Permalink
Share: Fix merge conflict
Browse files Browse the repository at this point in the history
Re-apply part of commit f638f33
(for issue #7429) that were gone in the previous merge
  • Loading branch information
ogoffart committed Feb 4, 2020
1 parent 68887c7 commit eb86fd3
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions src/gui/sharelinkwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down

0 comments on commit eb86fd3

Please sign in to comment.