From: Claudio Cambra Date: Tue, 20 Aug 2024 08:22:49 +0000 (+0800) Subject: Set invalid filename dialog mode in activity list model X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~6^2~53^2~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=598f2c95f5bee2ae8976d457560e716ccb7a1bff;p=nextcloud-desktop.git Set invalid filename dialog mode in activity list model Signed-off-by: Claudio Cambra --- diff --git a/src/gui/tray/activitylistmodel.cpp b/src/gui/tray/activitylistmodel.cpp index d00d1854c..61c05b8d8 100644 --- a/src/gui/tray/activitylistmodel.cpp +++ b/src/gui/tray/activitylistmodel.cpp @@ -729,9 +729,12 @@ void ActivityListModel::slotTriggerDefaultAction(const int activityIndex) const auto fileLocation = activity._syncFileItemStatus == SyncFileItem::FileNameInvalidOnServer ? InvalidFilenameDialog::FileLocation::NewLocalFile : InvalidFilenameDialog::FileLocation::Default; + const auto invalidMode = activity._syncFileItemStatus == SyncFileItem::FileNameInvalidOnServer + ? InvalidFilenameDialog::InvalidMode::ServerInvalid + : InvalidFilenameDialog::InvalidMode::SystemInvalid; _currentInvalidFilenameDialog = new InvalidFilenameDialog(_accountState->account(), folder, - folderDir.filePath(activity._file), fileLocation); + folderDir.filePath(activity._file), fileLocation, invalidMode); connect(_currentInvalidFilenameDialog, &InvalidFilenameDialog::accepted, folder, [folder]() { folder->scheduleThisFolderSoon(); });