[Places Panel] Stop drag activation timer when dropping

Avoids switching folders after a drop while interacting with
the Copy/Move/Link menu.

2 files changed, 11 insertions, 0 deletions

diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp
index 8fc81bb32..5b2f040d1 100644
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@ -165,6 +165,16 @@ void PlacesPanel::dragLeaveEvent(QDragLeaveEvent *event)
     }
 }
 
+void PlacesPanel::dropEvent(QDropEvent *event)
+{
+    KFilePlacesView::dropEvent(event);
+
+    if (m_dragActivationTimer) {
+        m_dragActivationTimer->stop();
+        m_pendingDragActivation = QPersistentModelIndex();
+    }
+}
+
 void PlacesPanel::slotConfigureTrash()
 {
     const QUrl url = currentIndex().data(KFilePlacesModel::UrlRole).toUrl();
diff --git a/src/panels/places/placespanel.h b/src/panels/places/placespanel.h
index fd6661c76..570fc43be 100644
--- a/src/panels/places/placespanel.h
+++ b/src/panels/places/placespanel.h
@@ -56,6 +56,7 @@ protected:
     void showEvent(QShowEvent* event) override;
     void dragMoveEvent(QDragMoveEvent *event) override;
     void dragLeaveEvent(QDragLeaveEvent *event) override;
+    void dropEvent(QDropEvent *event) override;
 
 private Q_SLOTS:
     void slotConfigureTrash();