From df1a9c5509543cc2dbfed5f0230918ae88473b81 Mon Sep 17 00:00:00 2001
From: Eldar Yusupov <eyusupov@gmail.com>
Date: Mon, 6 May 2024 11:51:14 +0300
Subject: [PATCH] Remove listener when window is destroyed (#3215)

---
 include/modules/dwl/window.hpp | 2 +-
 src/modules/dwl/window.cpp     | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/include/modules/dwl/window.hpp b/include/modules/dwl/window.hpp
index 6b068360..43586399 100644
--- a/include/modules/dwl/window.hpp
+++ b/include/modules/dwl/window.hpp
@@ -14,7 +14,7 @@ namespace waybar::modules::dwl {
 class Window : public AAppIconLabel, public sigc::trackable {
  public:
   Window(const std::string &, const waybar::Bar &, const Json::Value &);
-  virtual ~Window() = default;
+  ~Window();
 
   void handle_layout(const uint32_t layout);
   void handle_title(const char *title);
diff --git a/src/modules/dwl/window.cpp b/src/modules/dwl/window.cpp
index 4f8b0281..870d87e4 100644
--- a/src/modules/dwl/window.cpp
+++ b/src/modules/dwl/window.cpp
@@ -80,7 +80,7 @@ Window::Window(const std::string &id, const Bar &bar, const Json::Value &config)
   wl_registry_add_listener(registry, &registry_listener_impl, this);
   wl_display_roundtrip(display);
 
-  if (!status_manager_) {
+  if (status_manager_ == nullptr) {
     spdlog::error("dwl_status_manager_v2 not advertised");
     return;
   }
@@ -91,6 +91,12 @@ Window::Window(const std::string &id, const Bar &bar, const Json::Value &config)
   zdwl_ipc_manager_v2_destroy(status_manager_);
 }
 
+Window::~Window() {
+  if (output_status_ != nullptr) {
+    zdwl_ipc_output_v2_destroy(output_status_);
+  }
+}
+
 void Window::handle_title(const char *title) { title_ = title; }
 
 void Window::handle_appid(const char *appid) { appid_ = appid; }