┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEmmanuel Pescosta <[email protected]>2015-01-05 12:50:53 +0100
committerEmmanuel Pescosta <[email protected]>2015-01-05 12:50:53 +0100
commit39b77e9861c1318bff1a26627dde3fd1c9c71861 (patch)
treec87d78d78c3fea20b78e93b353fa36a9b00dece7 /src
parent7bd5bec21977c733dd3e1fc70f5afd66dda3ab97 (diff)
Always connect the drop job result with DolphinView::slotPasteJobResult
to receive the error message in case of an error also when the destUrl is not equal to the current url in the view. CCMAIL: [email protected]
Diffstat (limited to 'src')
-rw-r--r--src/views/dolphinview.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 32e182ce7..4129cc217 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -1048,12 +1048,15 @@ void DolphinView::dropUrls(const QUrl &destUrl, QDropEvent *dropEvent)
{
KIO::DropJob* job = DragAndDropHelper::dropUrls(destUrl, dropEvent, this);
- if (job && destUrl == url()) {
- // Mark the dropped urls as selected.
- m_clearSelectionBeforeSelectingNewItems = true;
- m_markFirstNewlySelectedItemAsCurrent = true;
- connect(job, &KIO::DropJob::itemCreated, this, &DolphinView::slotItemCreated);
+ if (job) {
connect(job, &KIO::DropJob::result, this, &DolphinView::slotPasteJobResult);
+
+ if (destUrl == url()) {
+ // Mark the dropped urls as selected.
+ m_clearSelectionBeforeSelectingNewItems = true;
+ m_markFirstNewlySelectedItemAsCurrent = true;
+ connect(job, &KIO::DropJob::itemCreated, this, &DolphinView::slotItemCreated);
+ }
}
}