Listener: cancel delayed connections on shutdown

CM4all · Dec 20, 2024 · fef521a · fef521a
1 parent ddcbcb8
commit fef521a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/debian/changelog b/debian/changelog
@@ -1,6 +1,6 @@
 cm4all-lukko (0.33) unstable; urgency=low
 
-  * 
+  * fix shutdown hang due to delayed connections
 
  --   
 

diff --git a/src/Listener.cxx b/src/Listener.cxx
@@ -47,6 +47,7 @@ Listener::Listener(Instance &_instance, const ListenerConfig &config)
 
 Listener::~Listener() noexcept
 {
+	delayed_connections.clear_and_dispose(DeleteDisposer{});
 	connections.clear_and_dispose(DeleteDisposer{});
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     Listener::~Listener() noexcept
     {
+    	delayed_connections.clear_and_dispose(DeleteDisposer{});
     	connections.clear_and_dispose(DeleteDisposer{});
     }
@@ Expand Down @@