From: alex-z <blackslayer4@gmail.com>
Date: Mon, 5 Jun 2023 17:55:57 +0000 (+0200)
Subject: Bugfix. Conflict resolution button not clickable.
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~10^2~15^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2fb2535c6bd7b544b03136f1e3a677a40aad7ffa;p=nextcloud-desktop.git

Bugfix. Conflict resolution button not clickable.

Signed-off-by: alex-z <blackslayer4@gmail.com>
---

diff --git a/src/gui/tray/ActivityItemContent.qml b/src/gui/tray/ActivityItemContent.qml
index a969eb395..81823e23e 100644
--- 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
             }