From 8b5b1eebbfa40325b77629b03a62f82d4a048158 Mon Sep 17 00:00:00 2001
From: Mervius <dhagemeier2001@gmail.com>
Date: Wed, 15 Apr 2026 10:35:26 -0500
Subject: [PATCH] Check if output still is in outputs before doing anything
 with it

---
 src/client.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/client.cpp b/src/client.cpp
index ff354e18..99a74123 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -95,7 +95,7 @@ void waybar::Client::handleOutputDone(void* data, struct zxdg_output_v1* /*xdg_o
 
       if (!client->bars_scheduled_) {
         client->bars_scheduled_ = true;
-      
+
         Glib::signal_idle().connect_once([client]() {
           client->createBarsBatch();
         }, Glib::PRIORITY_HIGH_IDLE);
@@ -107,6 +107,8 @@ void waybar::Client::handleOutputDone(void* data, struct zxdg_output_v1* /*xdg_o
 }
 
 void waybar::Client::createBarsBatch() {
+  pending_outputs_.remove_if([this](auto* output) { return std::none_of(outputs_.begin(), outputs_.end(),
+    [output](const auto& o) { return &o == output; }); });
   for (auto* output : pending_outputs_) {
     try {
       auto configs = getOutputConfigs(*output);