Need to NULL check for parent() in parentSurface()

Change-Id: I7252a616e8243074cfba8a473869fb91f84a60a6
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>

diff --git a/src/compositor/compositor_api/waylandsurface.cpp b/src/compositor/compositor_api/waylandsurface.cpp
index 69eb9d6..9aa6c28 100644 (file)
--- 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;