Merge pull request #5777 from nextcloud/backport/5766/stable-3.9

[stable-3.9] Bugfix. Conflict resolution button not clickable.
nextcloud · Jun 7, 2023 · 20bd460 · 20bd460
2 parents 21c5dec + 2fb2535
commit 20bd460
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
             }