From: Scott James Remnant <scott@ubuntu.com>
Date: Thu, 18 Mar 2010 20:24:57 +0000 (+0000)
Subject: [main] pull deactivate trigger in quit_program()
X-Git-Tag: 0.8.0~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=764e7dd306ee251f5d28ada6c57fdb3cd1b451ef;p=thirdparty%2Fplymouth.git

[main] pull deactivate trigger in quit_program()

To avoid a "plymouth deactivate" command hanging forever in the case
of the program quitting, pull the trigger before the quit trigger.
---

diff --git a/src/main.c b/src/main.c
index bc896a0d..62af0a92 100644
--- a/src/main.c
+++ b/src/main.c
@@ -702,6 +702,11 @@ quit_program (state_t *state)
     }
 #endif
 
+  if (state->deactivate_trigger != NULL)
+    {
+      ply_trigger_pull (state->deactivate_trigger, NULL);
+      state->deactivate_trigger = NULL;
+    }
   if (state->quit_trigger != NULL)
     {
       ply_trigger_pull (state->quit_trigger, NULL);