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/qwaylandintegration.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/qwaylandintegration.cpp')
| -rw-r--r-- | src/client/qwaylandintegration.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp index bd59e4270..a7668b1f0 100644 --- a/src/client/qwaylandintegration.cpp +++ b/src/client/qwaylandintegration.cpp @@ -399,9 +399,7 @@ void QWaylandIntegration::initializeShellIntegration() } } - Q_ASSERT(mShellIntegration); - - if (!mShellIntegration->initialize(mDisplay)) { + if (!mShellIntegration || !mShellIntegration->initialize(mDisplay)) { delete mShellIntegration; mShellIntegration = Q_NULLPTR; qWarning("Failed to load shell integration %s", qPrintable(targetKey)); |