From d2ab367e12423646d3a6bb35d16570f8e3126234 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 1 May 2024 08:23:00 -0400 Subject: [PATCH 1/2] 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. --- src/main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main.c b/src/main.c index 9c98bedf..ee6f3829 100644 --- a/src/main.c +++ b/src/main.c @@ -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); From 1e206268df99d28e9fb3d3cf8379a553abb05af0 Mon Sep 17 00:00:00 2001 From: nerdopolis Date: Tue, 20 Aug 2024 18:53:33 -0400 Subject: [PATCH 2/2] main: Correctly switch back to text mode if the splash is requested, but never shown Co-authored-by: filip-hejsek Suggested-by: filip-hejsek --- src/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main.c b/src/main.c index ee6f3829..e200c262 100644 --- a/src/main.c +++ b/src/main.c @@ -1470,6 +1470,10 @@ on_quit (state_t *state, state->splash_is_becoming_idle = true; } } else { + if (!state->should_retain_splash) { + hide_splash (state); + } + quit_splash (state); quit_program (state); } }