From 38503100519ca8d9716376f1d0fd9379ce26c27b Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@qt.io>
Date: Tue, 11 Oct 2016 11:35:14 +0200
Subject: [PATCH] Don't try to deliver event to destroyed window

Change-Id: If1c57250e2dc9e0d55767bbdfb15c3e3f5d9b333
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
---
 src/plugins/platforms/wayland/qwaylanddatadevice.cpp | 3 ++-
 src/plugins/platforms/wayland/qwaylanddatadevice_p.h | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/plugins/platforms/wayland/qwaylanddatadevice.cpp b/src/plugins/platforms/wayland/qwaylanddatadevice.cpp
index 0ff1f19794a..d04c20bf4d6 100644
--- a/src/plugins/platforms/wayland/qwaylanddatadevice.cpp
+++ b/src/plugins/platforms/wayland/qwaylanddatadevice.cpp
@@ -183,7 +183,8 @@ void QWaylandDataDevice::data_device_enter(uint32_t serial, wl_surface *surface,
 
 void QWaylandDataDevice::data_device_leave()
 {
-    QWindowSystemInterface::handleDrag(m_dragWindow, 0, QPoint(), Qt::IgnoreAction);
+    if (m_dragWindow)
+        QWindowSystemInterface::handleDrag(m_dragWindow, 0, QPoint(), Qt::IgnoreAction);
 
     QDrag *drag = static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag())->currentDrag();
     if (!drag) {
diff --git a/src/plugins/platforms/wayland/qwaylanddatadevice_p.h b/src/plugins/platforms/wayland/qwaylanddatadevice_p.h
index 579cb3c7c7c..7daa9f0d3c8 100644
--- a/src/plugins/platforms/wayland/qwaylanddatadevice_p.h
+++ b/src/plugins/platforms/wayland/qwaylanddatadevice_p.h
@@ -53,6 +53,7 @@
 //
 
 #include <QObject>
+#include <QPointer>
 #include <QPoint>
 
 #include <QtWaylandClient/private/qwayland-wayland.h>
@@ -106,7 +107,7 @@ private:
     QWaylandDisplay *m_display;
     QWaylandInputDevice *m_inputDevice;
     uint32_t m_enterSerial;
-    QWindow *m_dragWindow;
+    QPointer<QWindow> m_dragWindow;
     QPoint m_dragPoint;
     QScopedPointer<QWaylandDataOffer> m_dragOffer;
     QScopedPointer<QWaylandDataOffer> m_selectionOffer;