]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
main: Go back to text mode when quitting (if appropriate)
authorRay Strode <rstrode@redhat.com>
Wed, 1 May 2024 12:23:00 +0000 (08:23 -0400)
committernerdopolis <bluescreen_avenger@verizon.net>
Tue, 20 Aug 2024 22:18:18 +0000 (18:18 -0400)
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.

src/main.c

index 9c98bedfc0a5243584df6d44a9d7ad5635e4ddb0..ee6f38296a4d6fc698da922e00f4f4f0035d835d 100644 (file)
@@ -1236,10 +1236,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);