Skip to content

Commit

Permalink
Handle invalid filename activities button verb in activity list model
Browse files Browse the repository at this point in the history
Signed-off-by: Claudio Cambra <[email protected]>
  • Loading branch information
claucambra authored and mgallien committed Aug 21, 2024
1 parent a9dfc6e commit 94d62e0
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions src/gui/tray/activitylistmodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -840,9 +840,12 @@ void ActivityListModel::slotTriggerAction(const int activityIndex, const int act
if (action._verb == "WEB") {
Utility::openBrowser(QUrl(action._link));
return;
} else if (action._verb == "FIX_CONFLICT_LOCALLY" &&
activity._type == Activity::SyncFileItemType &&
(activity._syncFileItemStatus == SyncFileItem::Conflict || activity._syncFileItemStatus == SyncFileItem::FileNameClash)) {
} else if (((action._verb == "FIX_CONFLICT_LOCALLY" || action._verb == "RENAME_LOCAL_FILE") &&
activity._type == Activity::SyncFileItemType &&
(activity._syncFileItemStatus == SyncFileItem::Conflict ||
activity._syncFileItemStatus == SyncFileItem::FileNameClash ||
activity._syncFileItemStatus == SyncFileItem::FileNameInvalid ||
activity._syncFileItemStatus == SyncFileItem::FileNameInvalidOnServer))) {
slotTriggerDefaultAction(activityIndex);
return;
} else if (action._verb == ActivityLink::WhitelistFolderVerb && !activity._file.isEmpty()) { // _folder == folder alias/name, _file == folder/file path
Expand Down

0 comments on commit 94d62e0

Please sign in to comment.