From c52233bf9c5685c6824d7b46c17139f1b9b7e9c5 Mon Sep 17 00:00:00 2001
From: Elvis Lee <kwangwoong.lee@lge.com>
Date: Fri, 10 Aug 2012 14:52:30 +0900
Subject: Need to NULL check for parent() in parentSurface()

Change-Id: I7252a616e8243074cfba8a473869fb91f84a60a6
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
---
 src/compositor/compositor_api/waylandsurface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/compositor')

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;
-- 
cgit v1.2.3