From 686eda9d48b9d569986c122cfb8bdbe5264c6fe8 Mon Sep 17 00:00:00 2001
From: Vaxry <vaxry@vaxry.net>
Date: Mon, 5 Jan 2026 15:10:24 +0100
Subject: [PATCH] eventLoop: remove failed readable waiters

---
 src/managers/eventLoop/EventLoopManager.cpp | 11 +++++++++++
 src/managers/eventLoop/EventLoopManager.hpp |  1 +
 2 files changed, 12 insertions(+)

diff --git a/src/managers/eventLoop/EventLoopManager.cpp b/src/managers/eventLoop/EventLoopManager.cpp
index 496cbb83..9933edf6 100644
--- a/src/managers/eventLoop/EventLoopManager.cpp
+++ b/src/managers/eventLoop/EventLoopManager.cpp
@@ -58,6 +58,7 @@ static int configWatcherWrite(int fd, uint32_t mask, void* data) {
 static int handleWaiterFD(int fd, uint32_t mask, void* data) {
     if (mask & (WL_EVENT_HANGUP | WL_EVENT_ERROR)) {
         Log::logger->log(Log::ERR, "handleWaiterFD: readable waiter error");
+        g_pEventLoopManager->onFdReadableFail(sc<CEventLoopManager::SReadableWaiter*>(data));
         return 0;
     }
 
@@ -81,6 +82,16 @@ void CEventLoopManager::onFdReadable(SReadableWaiter* waiter) {
         taken->fn();
 }
 
+void CEventLoopManager::onFdReadableFail(SReadableWaiter* waiter) {
+    auto it = std::ranges::find_if(m_readableWaiters, [waiter](const UP<SReadableWaiter>& w) { return waiter == w.get() && w->fd == waiter->fd && w->source == waiter->source; });
+
+    // ???
+    if (it == m_readableWaiters.end())
+        return;
+
+    m_readableWaiters.erase(it);
+}
+
 void CEventLoopManager::enterLoop() {
     m_wayland.eventSource = wl_event_loop_add_fd(m_wayland.loop, m_timers.timerfd.get(), WL_EVENT_READABLE, timerWrite, nullptr);
 
diff --git a/src/managers/eventLoop/EventLoopManager.hpp b/src/managers/eventLoop/EventLoopManager.hpp
index 7a3b4314..7999dc59 100644
--- a/src/managers/eventLoop/EventLoopManager.hpp
+++ b/src/managers/eventLoop/EventLoopManager.hpp
@@ -65,6 +65,7 @@ class CEventLoopManager {
     // takes ownership of fd
     void doOnReadable(Hyprutils::OS::CFileDescriptor fd, std::function<void()>&& fn);
     void onFdReadable(SReadableWaiter* waiter);
+    void onFdReadableFail(SReadableWaiter* waiter);
 
   private:
     // Manages the event sources after AQ pollFDs change.