1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't try to deliver event to destroyed window

Browse Source 
Change-Id: If1c57250e2dc9e0d55767bbdfb15c3e3f5d9b333
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
This commit is contained in:
Paul Olav Tvete 2016-10-11 11:35:14 +02:00 committed by Johan Helsing
parent a33cc54705
commit 3850310051
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/platforms/wayland/qwaylanddatadevice.cpp
View File

@ -183,7 +183,8 @@ void QWaylandDataDevice::data_device_enter(uint32_t serial, wl_surface *surface,
void QWaylandDataDevice::data_device_leave() 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(); QDrag *drag = static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag())->currentDrag();
if (!drag) { if (!drag) {

3
src/plugins/platforms/wayland/qwaylanddatadevice_p.h
View File

@ -53,6 +53,7 @@
// //
#include <QObject> #include <QObject>
#include <QPointer>
#include <QPoint> #include <QPoint>
#include <QtWaylandClient/private/qwayland-wayland.h> #include <QtWaylandClient/private/qwayland-wayland.h>
@ -106,7 +107,7 @@ private:
QWaylandDisplay *m_display; QWaylandDisplay *m_display;
QWaylandInputDevice *m_inputDevice; QWaylandInputDevice *m_inputDevice;
uint32_t m_enterSerial; uint32_t m_enterSerial;
QWindow *m_dragWindow; QPointer<QWindow> m_dragWindow;
QPoint m_dragPoint; QPoint m_dragPoint;
QScopedPointer<QWaylandDataOffer> m_dragOffer; QScopedPointer<QWaylandDataOffer> m_dragOffer;
QScopedPointer<QWaylandDataOffer> m_selectionOffer; QScopedPointer<QWaylandDataOffer> m_selectionOffer;