From: Scott James Remnant <scott@ubuntu.com>
Date: Thu, 18 Mar 2010 20:39:01 +0000 (+0000)
Subject: [main] Ignore deactivate while deactivated
X-Git-Tag: 0.8.0~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dbd04d50d5b1fd25a0c762d27a906882d8f80480;p=thirdparty%2Fplymouth.git

[main] Ignore deactivate while deactivated

The other obvious command we should ignore while deactivated is
deactivate itself.
---

diff --git a/src/main.c b/src/main.c
index 339b0c02..383cf4ab 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_add_handler (state->deactivate_trigger,
                                (ply_trigger_handler_t)