From a44830c3a9f954c376d21d4526d94c26d19d010c Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Wed, 24 Aug 2022 17:00:01 +0200 Subject: Don't show error message on ERR_USER_CANCELED There's no point telling the user what they just did. After https://invent.kde.org/frameworks/kio/-/commit/f192c133eb01bc8448d5ddd97fe20f8e6dbc467d this error has a text associated with it, so it might show up in the UI. --- src/panels/folders/folderspanel.cpp | 6 +++++- src/panels/places/placespanel.cpp | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'src/panels') diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp index d3d8b81f1..d9cc6128c 100644 --- a/src/panels/folders/folderspanel.cpp +++ b/src/panels/folders/folderspanel.cpp @@ -255,7 +255,11 @@ void FoldersPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* eve KIO::DropJob *job = DragAndDropHelper::dropUrls(destItem.mostLocalUrl(), &dropEvent, this); if (job) { - connect(job, &KIO::DropJob::result, this, [this](KJob *job) { if (job->error()) Q_EMIT errorMessage(job->errorString()); }); + connect(job, &KIO::DropJob::result, this, [this](KJob *job) { + if (job->error() && job->error() != KIO::ERR_USER_CANCELED) { + Q_EMIT errorMessage(job->errorString()); + } + }); } } } diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp index a55df9b45..095dc9970 100644 --- a/src/panels/places/placespanel.cpp +++ b/src/panels/places/placespanel.cpp @@ -173,7 +173,11 @@ void PlacesPanel::slotUrlsDropped(const QUrl& dest, QDropEvent* event, QWidget* { KIO::DropJob *job = DragAndDropHelper::dropUrls(dest, event, parent); if (job) { - connect(job, &KIO::DropJob::result, this, [this](KJob *job) { if (job->error()) Q_EMIT errorMessage(job->errorString()); }); + connect(job, &KIO::DropJob::result, this, [this](KJob *job) { + if (job->error() && job->error() != KIO::ERR_USER_CANCELED) { + Q_EMIT errorMessage(job->errorString()); + } + }); } } -- cgit v1.3