diff options
| author | Andrew Knight <andrew.knight@digia.com> | 2013-12-04 17:27:01 +0200 |
|---|---|---|
| committer | Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> | 2013-12-15 11:21:05 +0100 |
| commit | 73b3b1f847e915be4913048080146f440869f41e (patch) | |
| tree | ad42f324a8a79029be9cf0f281423d5fe81e613a | |
| parent | 3e9412e2fd91e64a565ed8ddbef76f57ca9413d5 (diff) | |
QtCompositor: fix null pointer reference
Don't call a method on a null pointer in QWaylandInputPanel
Change-Id: I1e32a84323a06267bd5e3a4aee6c0a94c98b8df3
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
| -rw-r--r-- | src/compositor/compositor_api/qwaylandinputpanel.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/qwaylandinputpanel.cpp b/src/compositor/compositor_api/qwaylandinputpanel.cpp index 030014729..03084262c 100644 --- a/src/compositor/compositor_api/qwaylandinputpanel.cpp +++ b/src/compositor/compositor_api/qwaylandinputpanel.cpp @@ -75,7 +75,10 @@ QWaylandSurface *QWaylandInputPanel::focus() const { Q_D(const QWaylandInputPanel); - return d->inputPanel->focus()->waylandSurface(); + QtWayland::Surface *surface = d->inputPanel->focus(); + if (surface) + return surface->waylandSurface(); + return 0; } bool QWaylandInputPanel::visible() const |