[PATCH 07/20] [main] Ignore deactivate while deactivated

Scott James Remnant scott at ubuntu.com
Thu Mar 18 13:39:01 PDT 2010


The other obvious command we should ignore while deactivated is
deactivate itself.
---
 src/main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main.c b/src/main.c
index 628500a..cb56506 100644
--- a/src/main.c
+++ b/src/main.c
@@ -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_pull (deactivate_trigger, NULL);
       return;
-- 
1.7.0



More information about the plymouth mailing list