]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
[main] pull deactivate trigger in quit_program()
authorScott James Remnant <scott@ubuntu.com>
Thu, 18 Mar 2010 20:24:57 +0000 (20:24 +0000)
committerRay Strode <rstrode@redhat.com>
Mon, 22 Mar 2010 02:14:50 +0000 (22:14 -0400)
To avoid a "plymouth deactivate" command hanging forever in the case
of the program quitting, pull the trigger before the quit trigger.

src/main.c

index bc896a0d9fc4a8f95da8cfe887a6045218d45aa6..62af0a9205f1dd49fc4f235ed786cad3172572a8 100644 (file)
@@ -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);