output: fix destroying wl and headless outputs (#32)

hyprwm · Jul 25, 2024 · 0ab8ffa · 0ab8ffa
1 parent a7d77c6
commit 0ab8ffa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/backend/Headless.cpp b/src/backend/Headless.cpp
@@ -73,6 +73,7 @@ void Aquamarine::CHeadlessOutput::scheduleFrame(const scheduleFrameReason reason
 }
 
 bool Aquamarine::CHeadlessOutput::destroy() {
+    events.destroy.emit();
     std::erase(backend->outputs, self.lock());
     return true;
 }

diff --git a/src/backend/Wayland.cpp b/src/backend/Wayland.cpp
@@ -496,6 +496,7 @@ Aquamarine::CWaylandOutput::CWaylandOutput(const std::string& name_, Hyprutils::
 
 Aquamarine::CWaylandOutput::~CWaylandOutput() {
     backend->idleCallbacks.clear(); // FIXME: mega hack to avoid a UAF in frame events
+    events.destroy.emit();
     if (waylandState.xdgToplevel)
         waylandState.xdgToplevel->sendDestroy();
     if (waylandState.xdgSurface)