]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
[main] Ignore deactivate while deactivated
authorScott James Remnant <scott@ubuntu.com>
Thu, 18 Mar 2010 20:39:01 +0000 (20:39 +0000)
committerRay Strode <rstrode@redhat.com>
Mon, 22 Mar 2010 03:15:07 +0000 (23:15 -0400)
The other obvious command we should ignore while deactivated is
deactivate itself.

src/main.c

index 339b0c024dd33f6278e6d5923908d69f4c850e1b..383cf4ab91815d94137b0f968ddd1df9a69a8cec 100644 (file)
@@ -764,7 +764,7 @@ static void
 on_deactivate (state_t       *state,
                ply_trigger_t *deactivate_trigger)
 {
-  if (state->deactivate_trigger != NULL)
+  if ((state->deactivate_trigger != NULL) || state->is_inactive)
     {
       ply_trigger_add_handler (state->deactivate_trigger,
                                (ply_trigger_handler_t)