Skip to content

Commit ccd3526

Browse files
committed
fix(activity): open conflict dialog directly when notification is clicked.
Clicking a conflict entry brought the user to the activity log. Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Camila Ayres <hello@camilasan.com>
1 parent ccd0f3e commit ccd3526

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

src/gui/activity/activitylistmodel.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,13 @@ void ActivityListModel::slotTriggerDefaultAction(const int activityIndex)
920920

921921
const auto activity = _finalList.at(activityIndex);
922922
if (activity._syncFileItemStatus == SyncFileItem::Conflict) {
923-
displaySingleConflictDialog(activity);
923+
if (_conflictsList.size() > 1) {
924+
if (const auto systray = Systray::instance()) {
925+
systray->createResolveConflictsDialog(allConflicts());
926+
}
927+
} else {
928+
displaySingleConflictDialog(activity);
929+
}
924930

925931
return;
926932
} else if (activity._syncFileItemStatus == SyncFileItem::FileNameClash) {

0 commit comments

Comments
 (0)