If there are no more filehandles and a timer or event or process hook

orders shutdown, comply immediately without calling poll().

diff --git a/lib/mainloop.c b/lib/mainloop.c
index c1dad101f4be22f91f3a77bbcf215be86ade62a8..57e73742134e8d88e28b8dafba42c3becb2f360e 100644 (file)
--- a/lib/mainloop.c
+++ b/lib/mainloop.c
@@ -395,6 +395,8 @@ main_loop(void)
              wake = 0;
            }
        }
+      if (main_shutdown)
+       break;
       /* FIXME: Here is a small race window where SIGCHLD can come unnoticed. */
       if ((tm = clist_head(&main_timer_list)) && tm->expires < wake)
        wake = tm->expires;