diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2017-04-24 12:06:46 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2017-04-25 12:17:38 +0000 |
| commit | 014dd47b284325c32e8b404cf59852b810cc51ad (patch) | |
| tree | e76fb696752c3fe3de636fbb7f6eec21a99b37a5 | |
| parent | e9bf98d2bf8c1d5d4f671bcb6146ed13de213f01 (diff) | |
Fix nullptr dereference in QWaylandSeat::setKeyboardFocus
Task-number: QTBUG-60251
Change-Id: I82da2226640154d2384a9894c1f3ca46181b80d3
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
| -rw-r--r-- | src/compositor/compositor_api/qwaylandseat.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/qwaylandseat.cpp b/src/compositor/compositor_api/qwaylandseat.cpp index 10d29d6c3..d3cc4394f 100644 --- a/src/compositor/compositor_api/qwaylandseat.cpp +++ b/src/compositor/compositor_api/qwaylandseat.cpp @@ -392,7 +392,7 @@ bool QWaylandSeat::setKeyboardFocus(QWaylandSurface *surface) d->keyboard->setFocus(surface); #if QT_CONFIG(wayland_datadevice) if (d->data_device) - d->data_device->setFocus(surface->client()); + d->data_device->setFocus(surface ? surface->client() : nullptr); #endif emit keyboardFocusChanged(surface, oldSurface); return true; |