1 files changed, 8 insertions, 0 deletions
diff --git a/src/protocols/core/DataDevice.cpp b/src/protocols/core/DataDevice.cpp
index b7640af3..8c1a48d8 100644
--- a/src/protocols/core/DataDevice.cpp
+++ b/src/protocols/core/DataDevice.cpp
@@ -67,6 +67,13 @@ CWLDataOfferResource::CWLDataOfferResource(SP<CWlDataOffer> resource_, SP<IDataS
     });
 }
 
+CWLDataOfferResource::~CWLDataOfferResource() {
+    if (!source || !source->hasDnd() || dead)
+        return;
+
+    source->sendDndFinished();
+}
+
 bool CWLDataOfferResource::good() {
     return resource->resource();
 }
@@ -173,6 +180,7 @@ void CWLDataSourceResource::sendDndDropPerformed() {
     if (resource->version() < 3)
         return;
     resource->sendDndDropPerformed();
+    dropped = true;
 }
 
 void CWLDataSourceResource::sendDndFinished() {