Merge pull request #5766 from nextcloud/bugfix/conflict-resolution-bu…

…tton-in-activity-not-working Bugfix. Conflict resolution button not clickable.
nextcloud · Jun 7, 2023 · d63eb6a · d63eb6a
2 parents ec302c8 + fd69e6d
commit d63eb6a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/gui/tray/ActivityItemContent.qml b/src/gui/tray/ActivityItemContent.qml
@@ -270,7 +270,7 @@ RowLayout {
 
                 maxActionButtons: activityModel.maxActionButtons
 
-                onTriggerAction: activityModel.slotTriggerAction(model.activityIndex, actionIndex)
+                onTriggerAction: activityModel.slotTriggerAction(activityData.activityIndex, actionIndex)
 
                 onShowReplyField: isTalkReplyOptionVisible = true
             }