output/xdg-output: avoid sending events to released globals

ref #6835

1 files changed, 4 insertions, 1 deletions

diff --git a/src/protocols/core/Output.cpp b/src/protocols/core/Output.cpp
index 7b88e0a8..4047774a 100644
--- a/src/protocols/core/Output.cpp
+++ b/src/protocols/core/Output.cpp
@@ -47,7 +47,7 @@ SP<CWlOutput> CWLOutputResource::getResource() {
 }
 
 void CWLOutputResource::updateState() {
-    if (!monitor || (owner && owner->defunct))
+    if (!monitor || !owner || owner->defunct)
         return;
 
     if (resource->version() >= 2)
@@ -119,6 +119,9 @@ bool CWLOutputProtocol::isDefunct() {
 }
 
 void CWLOutputProtocol::sendDone() {
+    if (defunct)
+        return;
+
     for (auto const& r : m_vOutputs) {
         r->resource->sendDone();
     }