From 94d62e020398af33e5cf955097ca4f57dda6df46 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Tue, 20 Aug 2024 15:24:06 +0800 Subject: [PATCH] Handle invalid filename activities button verb in activity list model Signed-off-by: Claudio Cambra --- src/gui/tray/activitylistmodel.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/gui/tray/activitylistmodel.cpp b/src/gui/tray/activitylistmodel.cpp index 3976e9950..d00d1854c 100644 --- a/src/gui/tray/activitylistmodel.cpp +++ b/src/gui/tray/activitylistmodel.cpp @@ -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 -- 2.30.2