]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
main: Go back to text mode when quitting (if appropriate) fix-text-splash-regression
authorRay Strode <rstrode@redhat.com>
Wed, 1 May 2024 12:23:00 +0000 (08:23 -0400)
committerRay Strode <rstrode@redhat.com>
Wed, 1 May 2024 12:25:46 +0000 (08:25 -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 33fe51e0766bcee5bd58ff696f9a2f6c03627d35..5916ddcdc70f17a472eac2a65df6314e327df89a 100644 (file)
@@ -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);