From 8249070ff104834db6a58ce44ff6276cbe736eeb Mon Sep 17 00:00:00 2001 From: Jari Sundell Date: Fri, 19 Jun 2026 15:55:22 +0900 Subject: [PATCH] Remove shutdown comments for directory watch Remove commented code regarding directory watch closure during shutdown. --- src/control.cc | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/control.cc b/src/control.cc index 888408cf..c747d999 100644 --- a/src/control.cc +++ b/src/control.cc @@ -88,13 +88,6 @@ Control::cleanup() { if(!display::Canvas::daemon()) m_inputStdin->remove(); - // Close the directory watch (inotify) Event on every shutdown path. - // handle_shutdown() only closes it on a normal shutdown; a quick shutdown - // (SIGTERM -> receive_quick_shutdown) takes the m_shutdownQuick branch and - // skips it, leaving directory_events registered in the poll. ~Control() would - // then destroy it while still open and trip the Event::~Event() assert - // (m_poll_event == nullptr) -> SIGABRT. close() is idempotent (no-op when the - // normal path already closed it). m_directory_events->close(); if (scgi_thread::thread()->is_active())