summaryrefslogtreecommitdiffstats
path: root/src/compositor/wayland_wrapper
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@nokia.com>2012-01-17 15:26:05 +0100
committerAndy Nichols <andy.nichols@nokia.com>2012-01-17 15:34:52 +0100
commit7e4ed0367d241f89fa6f7af20c453266ab60655b (patch)
treec74e4a709a98e6cfe30d5e77161aa88727961cb5 /src/compositor/wayland_wrapper
parente6d9b6cd8c9eb47dc3f674c2f6856f95c1b0558d (diff)
Null pointer check
managedClient() is allowed to return 0. Change-Id: I67f4ad9cc9bf40a829c2a26895529cabf5a716c0 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
Diffstat (limited to 'src/compositor/wayland_wrapper')
-rw-r--r--src/compositor/wayland_wrapper/wlsurface.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compositor/wayland_wrapper/wlsurface.cpp b/src/compositor/wayland_wrapper/wlsurface.cpp
index 17fd3b2ad..307a427bc 100644
--- a/src/compositor/wayland_wrapper/wlsurface.cpp
+++ b/src/compositor/wayland_wrapper/wlsurface.cpp
@@ -577,7 +577,8 @@ void Surface::setProcessId(qint64 processId)
QByteArray Surface::authenticationToken() const
{
Q_D(const Surface);
- return d->compositor->windowManagerIntegration()->managedClient(base()->resource.client)->authenticationToken();
+ WaylandManagedClient *mcl = d->compositor->windowManagerIntegration()->managedClient(base()->resource.client);
+ return mcl ? mcl->authenticationToken() : QByteArray();
}
QVariantMap Surface::windowProperties() const