From: Scott James Remnant <scott@netsplit.com>
Date: Wed, 23 Dec 2009 03:44:21 +0000 (-0500)
Subject: [main] quit program when quit given after deactivate
X-Git-Tag: 0.8.0~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c35dfb1ca809feab39eed8373d538ebe71c4221;p=thirdparty%2Fplymouth.git

[main] quit program when quit given after deactivate

If plymouth quit (without --retain-splash) follows plymouth deactivate,
plymouth will never actually quit (or pull the trigger for the client)
---

diff --git a/src/main.c b/src/main.c
index 42beab5e..1103b8e5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -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);
 }