diff --git a/src/windowsystem/waylandintegration.cpp b/src/windowsystem/waylandintegration.cpp
index 95c2464..40bb84a 100644
--- a/src/windowsystem/waylandintegration.cpp
+++ b/src/windowsystem/waylandintegration.cpp
@@ -111,6 +111,9 @@ KWayland::Client::ConnectionThread *WaylandIntegration::waylandConnection() cons
KWayland::Client::BlurManager *WaylandIntegration::waylandBlurManager()
{
if (!m_waylandBlurManager) {
+ if (qApp->closingDown()) {
+ return nullptr;
+ }
const KWayland::Client::Registry::AnnouncedInterface wmInterface = m_registry->interface(KWayland::Client::Registry::Interface::Blur);
if (wmInterface.name == 0) {
@@ -133,6 +136,9 @@ KWayland::Client::BlurManager *WaylandIntegration::waylandBlurManager()
KWayland::Client::ContrastManager *WaylandIntegration::waylandContrastManager()
{
if (!m_waylandContrastManager) {
+ if (qApp->closingDown()) {
+ return nullptr;
+ }
const KWayland::Client::Registry::AnnouncedInterface wmInterface = m_registry->interface(KWayland::Client::Registry::Interface::Contrast);
if (wmInterface.name == 0) {
@@ -155,6 +161,9 @@ KWayland::Client::ContrastManager *WaylandIntegration::waylandContrastManager()
KWayland::Client::SlideManager *WaylandIntegration::waylandSlideManager()
{
if (!m_waylandSlideManager) {
+ if (qApp->closingDown()) {
+ return nullptr;
+ }
const KWayland::Client::Registry::AnnouncedInterface wmInterface = m_registry->interface(KWayland::Client::Registry::Interface::Slide);
if (wmInterface.name == 0) {
@@ -184,6 +193,9 @@ KWayland::Client::PlasmaWindowManagement *WaylandIntegration::plasmaWindowManage
using namespace KWayland::Client;
if (!m_wm) {
+ if (qApp->closingDown()) {
+ return nullptr;
+ }
const Registry::AnnouncedInterface wmInterface = m_registry->interface(Registry::Interface::PlasmaWindowManagement);
if (wmInterface.name == 0) {
@@ -223,6 +235,10 @@ KWayland::Client::PlasmaWindowManagement *WaylandIntegration::plasmaWindowManage
KWayland::Client::PlasmaShell *WaylandIntegration::waylandPlasmaShell()
{
if (!m_waylandPlasmaShell) {
+ if (qApp->closingDown()) {
+ return nullptr;
+ }
+
const KWayland::Client::Registry::AnnouncedInterface wmInterface = m_registry->interface(KWayland::Client::Registry::Interface::PlasmaShell);
if (wmInterface.name == 0) {