mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-24 13:25:52 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5766 from nextcloud/bugfix/conflict-resolution-button-in-activity-not-working

Browse source 
Bugfix. Conflict resolution button not clickable.
This commit is contained in:
Matthieu Gallien 2023-06-07 11:47:03 +02:00 committed by GitHub
commit d63eb6a211
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/tray/ActivityItemContent.qml
View file

@ -270,7 +270,7 @@ RowLayout {
maxActionButtons: activityModel.maxActionButtons
onTriggerAction: activityModel.slotTriggerAction(model.activityIndex, actionIndex)
onTriggerAction: activityModel.slotTriggerAction(activityData.activityIndex, actionIndex)
onShowReplyField: isTalkReplyOptionVisible = true
}