From: Scott James Remnant <scott@ubuntu.com>
Date: Thu, 18 Mar 2010 20:30:25 +0000 (+0000)
Subject: [main] Ignore --show-splash while deactivated
X-Git-Tag: 0.8.0~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=704397b5e84c1ad72b5864eb312df4b2820b954e;p=thirdparty%2Fplymouth.git

[main] Ignore --show-splash while deactivated

The last thing we want to do after plymouth deactivate is called by
the X display manager is listen to calls to show the splash screen
again.

So don't.
---

diff --git a/src/main.c b/src/main.c
index 5f432798..21ffa0f6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -578,6 +578,9 @@ on_show_splash (state_t *state)
 {
   bool has_display;
 
+  if (state->is_inactive)
+    return;
+
   if (plymouth_should_ignore_show_splash_calls (state))
     {
       dump_details_and_quit_splash (state);