]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
[main] Ignore --show-splash while deactivated
authorScott James Remnant <scott@ubuntu.com>
Thu, 18 Mar 2010 20:30:25 +0000 (20:30 +0000)
committerRay Strode <rstrode@redhat.com>
Mon, 22 Mar 2010 03:15:06 +0000 (23:15 -0400)
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.

src/main.c

index 5f4327983e28cfa0ef9c4aad5c646d0af4293aec..21ffa0f6359f8e1c3b8196059249f2ab3b2dbefc 100644 (file)
@@ -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);