diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-15 03:02:02 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-15 03:02:02 +0200 |
| commit | 28927feb98e38bce391b9817674451b7ca863fd0 (patch) | |
| tree | a25c45f12e43dd1a8058c309017e857927647be3 /src | |
| parent | e367643f57d0ce08759e9ec9a2e21696023036a9 (diff) | |
| parent | af00b80178138e55be7ea892a118e6357798e0f2 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I3b4132c4824a5312e7af0ca5659bd34269cb02fe
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/qwaylanddatadevice.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/client/qwaylanddatadevice.cpp b/src/client/qwaylanddatadevice.cpp index 300c9de0a..11984f9d3 100644 --- a/src/client/qwaylanddatadevice.cpp +++ b/src/client/qwaylanddatadevice.cpp @@ -111,7 +111,10 @@ void QWaylandDataDevice::startDrag(QMimeData *mimeData, QWaylandWindow *icon) if (!origin) origin = m_display->currentInputDevice()->touchFocus(); - start_drag(m_dragSource->object(), origin->object(), icon->object(), m_display->currentInputDevice()->serial()); + if (origin) + start_drag(m_dragSource->object(), origin->object(), icon->object(), m_display->currentInputDevice()->serial()); + else + qCDebug(lcQpaWayland) << "Couldn't start a drag because the origin window could not be found."; } void QWaylandDataDevice::cancelDrag() |