From 77818e34578769c25bb978553f076d25704914b6 Mon Sep 17 00:00:00 2001 From: Po-Yeh Chen Date: Fri, 28 Jul 2023 23:12:24 +0800 Subject: [PATCH] xwayland: Add temporary fix for #2808 by adding nullptr check. (#2829) * Add temporary fix for #2808 by adding nullptr check. * Remove redundency. --- src/protocols/XDGOutput.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/protocols/XDGOutput.cpp b/src/protocols/XDGOutput.cpp index ab0820e0..274f6a19 100644 --- a/src/protocols/XDGOutput.cpp +++ b/src/protocols/XDGOutput.cpp @@ -77,7 +77,7 @@ void CXDGOutputProtocol::onManagerGetXDGOutput(wl_client* client, wl_resource* r SXDGOutput* pXDGOutput = m_vXDGOutputs.emplace_back(std::make_unique(PMONITOR)).get(); #ifndef NO_XWAYLAND - if (g_pXWaylandManager->m_sWLRXWayland->server->client == client) + if (g_pXWaylandManager->m_sWLRXWayland && g_pXWaylandManager->m_sWLRXWayland->server && g_pXWaylandManager->m_sWLRXWayland->server->client == client) pXDGOutput->isXWayland = true; #endif pXDGOutput->client = client; @@ -124,4 +124,4 @@ void CXDGOutputProtocol::updateAllOutputs() { wlr_output_schedule_done(o->monitor->output); } -} \ No newline at end of file +}