From: Ray Strode <rstrode@redhat.com>
Date: Thu, 1 Nov 2012 21:04:33 +0000 (-0400)
Subject: main: if deactivate when already deactivated return immediately
X-Git-Tag: 0.9.0~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ccedf7b6ecdc8314ed97355cfe5499fffb13a1e;p=thirdparty%2Fplymouth.git

main: if deactivate when already deactivated return immediately

We were trying to ignore second deactivate requests, but
were instead crashing because we're trying to use a nullified
trigger.

This commit makes sure things don't go crashy when a user
does "plymouth deactivate" on an already deactivated plymouthd.
---

diff --git a/src/main.c b/src/main.c
index 88e50025..60ca28f5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1135,7 +1135,13 @@ static void
 on_deactivate (state_t       *state,
                ply_trigger_t *deactivate_trigger)
 {
-  if ((state->deactivate_trigger != NULL) || state->is_inactive)
+  if (state->is_inactive)
+    {
+      ply_trigger_pull (deactivate_trigger, NULL);
+      return;
+    }
+
+  if (state->deactivate_trigger != NULL)
     {
       ply_trigger_add_handler (state->deactivate_trigger,
                                (ply_trigger_handler_t)