Do not allow files or folders inside trash to be added to dolphin's places panel

REVIEW: 120286
BUG: 339204
FIXED-IN: 4.14.2

diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp
index 1f05e07f95a3e1dfdb80b7716acdfc41bbb1fdd4..2ac2169586a7eaf757bf1c3673a4c113460c60a2 100644 (file)
--- a/src/panels/places/placesitemmodel.cpp
+++ b/src/panels/places/placesitemmodel.cpp
@@ -432,8 +432,9 @@ void PlacesItemModel::dropMimeDataBefore(int index, const QMimeData* mimeData)
                 text = url.host();
             }
 
-            if (url.isLocalFile() && !QFileInfo(url.toLocalFile()).isDir()) {
-                // Only directories are allowed
+            if ((url.isLocalFile() && !QFileInfo(url.toLocalFile()).isDir())
+                    || url.protocol() == "trash") {
+                // Only directories outside the trash are allowed
                 continue;
             }