From: Laurent Bigonville <bigon@bigon.be>
Date: Tue, 7 Apr 2020 13:22:02 +0000 (-0400)
Subject: main: fix mode changing before splash is shown
X-Git-Tag: 0.9.5~5^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=702fd05feb8e0d38c8ac5ae72c3ed171cd91990e;p=thirdparty%2Fplymouth.git

main: fix mode changing before splash is shown

At the moment switching modes affects two aspects of how plymouth
runs.

1) What log file is opened (i.e., boot.log or no log file at all)
2) What type of splash gets shown (the details of which are relegated
   to the individual splash plugins)

The mode change handler has a check in place to avoid changing the
type of splash getting shown in the event no splash is supposed to
be shown yet.  This check just makes the function return without
doing anything.

Unfortunately, the check is placed at the top of the function, so
it runs before the log file is changed.

This commit moves the check lower down, so the log file gets properly
updated when the mode is changed.
---

diff --git a/src/main.c b/src/main.c
index f2232175..f0377848 100644
--- a/src/main.c
+++ b/src/main.c
@@ -192,11 +192,6 @@ static void
 on_change_mode (state_t    *state,
                 const char *mode)
 {
-        if (state->boot_splash == NULL) {
-                ply_trace ("no splash set");
-                return;
-        }
-
         ply_trace ("updating mode to '%s'", mode);
         if (strcmp (mode, "boot-up") == 0)
                 state->mode = PLY_BOOT_SPLASH_MODE_BOOT_UP;
@@ -217,6 +212,11 @@ on_change_mode (state_t    *state,
                 prepare_logging (state);
         }
 
+        if (state->boot_splash == NULL) {
+                ply_trace ("no splash set");
+                return;
+        }
+
         if (!ply_boot_splash_show (state->boot_splash, state->mode)) {
                 ply_trace ("failed to update splash");
                 return;