From: Ray Strode <rstrode@redhat.com>
Date: Wed, 1 May 2024 12:23:00 +0000 (-0400)
Subject: main: Go back to text mode when quitting (if appropriate)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Ffix-text-splash-regression;p=thirdparty%2Fplymouth.git

main: Go back to text mode when quitting (if appropriate)

Since commit 48881ba2ef3d25fd27fd150d4d5957d4df9868e0 plymouth
goes into GRAPHICS mode early on. Unfortunately, there are cases
where it neglects to go back to TEXT mode when quitting. That can
happen if boot finishes before the splash screen is created.

This commit fixes that.
---

diff --git a/src/main.c b/src/main.c
index 33fe51e0..5916ddcd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1223,10 +1223,8 @@ hide_splash (state_t *state)
 
         cancel_pending_delayed_show (state);
 
-        if (state->boot_splash == NULL)
-                return;
-
-        ply_boot_splash_hide (state->boot_splash);
+        if (state->boot_splash != NULL)
+                ply_boot_splash_hide (state->boot_splash);
 
         if (state->local_console_terminal != NULL) {
                 ply_terminal_set_mode (state->local_console_terminal, PLY_TERMINAL_MODE_TEXT);