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

[main] Ensure second deactivate blocks until deactivation

When it comes to deactivation where the various steps of boot
have to be carefully synchronized, we need to make sure that
the client doesn't return early.
---

diff --git a/src/main.c b/src/main.c
index f914a371..a4b6eba3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -760,7 +760,10 @@ on_deactivate (state_t       *state,
 {
   if (state->deactivate_trigger != NULL)
     {
-      ply_trigger_pull (deactivate_trigger, NULL);
+      ply_trigger_add_handler (state->deactivate_trigger,
+                               (ply_trigger_handler_t)
+                               ply_trigger_pull,
+                               deactivate_trigger);
       return;
     }