From: Ray Strode <rstrode@redhat.com>
Date: Mon, 22 Mar 2010 02:59:09 +0000 (-0400)
Subject: [main] Ensure second quit blocks until quit processed
X-Git-Tag: 0.8.0~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2dead90bd18fd79fffb1df9398c2be8f852636d2;p=thirdparty%2Fplymouth.git

[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 a4b6eba3..5f432798 100644
--- 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;
     }