wayland/output: avoid sending events to dead outputs

ref #6835

1 files changed, 4 insertions, 2 deletions

diff --git a/src/protocols/core/Output.hpp b/src/protocols/core/Output.hpp
index 46e4057b..49c32ec1 100644
--- a/src/protocols/core/Output.hpp
+++ b/src/protocols/core/Output.hpp
@@ -8,6 +8,7 @@
 #include "../../helpers/signal/Signal.hpp"
 
 class CMonitor;
+class CWLOutputProtocol;
 
 class CWLOutputResource {
   public:
@@ -20,7 +21,7 @@ class CWLOutputResource {
     void                         updateState();
 
     WP<CMonitor>                 monitor;
-
+    WP<CWLOutputProtocol>        owner;
     WP<CWLOutputResource>        self;
 
   private:
@@ -40,6 +41,7 @@ class CWLOutputProtocol : public IWaylandProtocol {
     void                  sendDone();
 
     WP<CMonitor>          monitor;
+    WP<CWLOutputProtocol> self;
 
     // will mark the protocol for removal, will be removed when no. of bound outputs is 0 (or when overwritten by a new global)
     void remove();
@@ -61,5 +63,5 @@ class CWLOutputProtocol : public IWaylandProtocol {
 };
 
 namespace PROTO {
-    inline std::unordered_map<std::string, UP<CWLOutputProtocol>> outputs;
+    inline std::unordered_map<std::string, SP<CWLOutputProtocol>> outputs;
 };