[main] Ensure second quit blocks until quit processed

When it comes to quitting, which must be carefully coordinated
with other subsystems during the boot process, we need to make
sure the client doesn't return early.

diff --git a/src/main.c b/src/main.c
index a4b6eba30c03a5520cd6e43bad41c590b57a6d8a..5f4327983e28cfa0ef9c4aad5c646d0af4293aec 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -791,7 +791,10 @@ on_quit (state_t       *state,
 {
   if (state->quit_trigger != NULL)
     {
-      ply_trigger_pull (quit_trigger, NULL);
+      ply_trigger_add_handler (state->quit_trigger,
+                               (ply_trigger_handler_t)
+                               ply_trigger_pull,
+                               quit_trigger);
       return;
     }