diff options
| author | Elvis Lee <kwangwoong.lee@lge.com> | 2012-08-10 14:52:30 +0900 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2012-08-10 09:43:46 +0200 |
| commit | c52233bf9c5685c6824d7b46c17139f1b9b7e9c5 (patch) | |
| tree | cbb2ffe60bd35d319d71a25a1f7e72d5c82ee3f5 /src/compositor | |
| parent | 6728e205cc3d3ada64fd7e7df1e1e8ee5aa80266 (diff) | |
Need to NULL check for parent() in parentSurface()
Change-Id: I7252a616e8243074cfba8a473869fb91f84a60a6
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Diffstat (limited to 'src/compositor')
| -rw-r--r-- | src/compositor/compositor_api/waylandsurface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/waylandsurface.cpp b/src/compositor/compositor_api/waylandsurface.cpp index 69eb9d61d..9aa6c2806 100644 --- a/src/compositor/compositor_api/waylandsurface.cpp +++ b/src/compositor/compositor_api/waylandsurface.cpp @@ -97,7 +97,7 @@ WaylandClient *WaylandSurface::client() const WaylandSurface *WaylandSurface::parentSurface() const { Q_D(const WaylandSurface); - if (d->surface->subSurface()) { + if (d->surface->subSurface() && d->surface->subSurface()->parent()) { return d->surface->subSurface()->parent()->waylandSurface(); } return 0; |