From 6cb80c8a53d75638ca3ed16aacc2af987529c4e4 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Sun, 4 Sep 2016 08:42:04 +0200 Subject: [PATCH] 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 --- src/plugins/platforms/wayland/qwaylanddisplay.cpp | 3 ++- src/plugins/platforms/wayland/qwaylandintegration.cpp | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.cpp b/src/plugins/platforms/wayland/qwaylanddisplay.cpp index a5e61e28a73..d94afcab5c9 100644 --- a/src/plugins/platforms/wayland/qwaylanddisplay.cpp +++ b/src/plugins/platforms/wayland/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); } diff --git a/src/plugins/platforms/wayland/qwaylandintegration.cpp b/src/plugins/platforms/wayland/qwaylandintegration.cpp index bd59e42704d..a7668b1f0ec 100644 --- a/src/plugins/platforms/wayland/qwaylandintegration.cpp +++ b/src/plugins/platforms/wayland/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));