diff options
| author | Paul Olav Tvete <paul.tvete@gmail.com> | 2016-09-04 08:42:04 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2016-09-05 09:36:54 +0000 |
| commit | 7eccad7db057ed841e3670d14274213dcf8416e5 (patch) | |
| tree | 9ea9fece5d7d6e22322189f410338dd7d9c0ea45 /src/client/qwaylanddisplay.cpp | |
| parent | b0c416dede8b6ca596eb2a13361d98613e8c9533 (diff) | |
Don't assume we always have a shell
The mininimal-cpp compositor example does not have any shell extensions.
Change-Id: Ifec2822ef4f5944eed02c19ddfc47419051364a4
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Diffstat (limited to 'src/client/qwaylanddisplay.cpp')
| -rw-r--r-- | src/client/qwaylanddisplay.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp index a5e61e28a..d94afcab5 100644 --- a/src/client/qwaylanddisplay.cpp +++ b/src/client/qwaylanddisplay.cpp @@ -84,7 +84,8 @@ struct wl_surface *QWaylandDisplay::createSurface(void *handle) QWaylandShellSurface *QWaylandDisplay::createShellSurface(QWaylandWindow *window) { - Q_ASSERT(mWaylandIntegration->shellIntegration()); + if (!mWaylandIntegration->shellIntegration()) + return 0; return mWaylandIntegration->shellIntegration()->createShellSurface(window); } |