fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-05-07 10:48:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fixterminal' into 'main'

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

See merge request plymouth/plymouth!334
This commit is contained in:
Ray Strode 2024-08-28 04:10:37 +00:00
commit ea83580a6d
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main.c
View 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);
@ -1472,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);
}
}