]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
[main] quit program when quit given after deactivate
authorScott James Remnant <scott@netsplit.com>
Wed, 23 Dec 2009 03:44:21 +0000 (22:44 -0500)
committerRay Strode <rstrode@redhat.com>
Wed, 23 Dec 2009 03:44:21 +0000 (22:44 -0500)
If plymouth quit (without --retain-splash) follows plymouth deactivate,
plymouth will never actually quit (or pull the trigger for the client)

src/main.c

index 42beab5ecf2850dc282c5b5ea4c631f278b54504..1103b8e525250f96bcead54e216c5a8ad68a2a82 100644 (file)
@@ -771,9 +771,12 @@ on_quit (state_t       *state,
                                    state);
     }
   else if (state->is_inactive && !retain_splash)
-    /* We've been deactivated and X failed to start
-     */
-    dump_details_and_quit_splash (state);
+    {
+      /* We've been deactivated and X failed to start
+       */
+      dump_details_and_quit_splash (state);
+      quit_program (state);
+    }
   else
     quit_program (state);
 }