summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@digia.com>2014-08-22 14:59:30 +0200
committerLaszlo Agocs <laszlo.agocs@digia.com>2014-08-22 15:04:44 +0200
commit9ef9fdf92bc642c6bafbd44836aba4bfae1bc0d3 (patch)
tree348a88e12555327eebc6245d0913cc223047e5d5
parent9541f826a4de72b620f4bd3aa7f74a82348bc91a (diff)
downloadqtwayland-9ef9fdf92bc642c6bafbd44836aba4bfae1bc0d3.tar.gz
Do not crash when querying transientParent() and there's none
Change-Id: I47cddffd7859df2548dacb6aee13beb15a222451 Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
-rw-r--r--src/compositor/compositor_api/qwaylandsurface.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp
index c0a04c29..4badc030 100644
--- a/src/compositor/compositor_api/qwaylandsurface.cpp
+++ b/src/compositor/compositor_api/qwaylandsurface.cpp
@@ -195,7 +195,7 @@ QWaylandSurface::WindowType QWaylandSurface::windowType() const
QWaylandSurface *QWaylandSurface::transientParent() const
{
Q_D(const QWaylandSurface);
- return d->transientParent()->waylandSurface();
+ return d->transientParent() ? d->transientParent()->waylandSurface() : 0;
}
QPointF QWaylandSurface::transientOffset() const