mirror of
https://gitlab.freedesktop.org/plymouth/plymouth.git
synced 2026-05-08 14:48:01 +02:00
Force windows to get closed on quit
If plymouth was called with --retain-splash, the window wasn't getting closed which caused the tty to not get reset correctly.
This commit is contained in:
parent
845f4dd500
commit
4fc5d6b5bd
1 changed files with 14 additions and 4 deletions
18
src/main.c
18
src/main.c
|
|
@ -323,13 +323,10 @@ on_show_splash (state_t *state)
|
|||
}
|
||||
|
||||
static void
|
||||
on_hide_splash (state_t *state)
|
||||
quit_splash (state_t *state)
|
||||
{
|
||||
|
||||
ply_trace ("hiding boot splash");
|
||||
if (state->boot_splash != NULL)
|
||||
{
|
||||
ply_boot_splash_hide (state->boot_splash);
|
||||
ply_boot_splash_free (state->boot_splash);
|
||||
state->boot_splash = NULL;
|
||||
}
|
||||
|
|
@ -350,6 +347,17 @@ on_hide_splash (state_t *state)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
on_hide_splash (state_t *state)
|
||||
{
|
||||
|
||||
ply_trace ("hiding boot splash");
|
||||
if (state->boot_splash != NULL)
|
||||
ply_boot_splash_hide (state->boot_splash);
|
||||
|
||||
quit_splash (state);
|
||||
}
|
||||
|
||||
#ifdef PLY_ENABLE_GDM_TRANSITION
|
||||
static void
|
||||
tell_gdm_to_transition (void)
|
||||
|
|
@ -373,6 +381,8 @@ on_quit (state_t *state,
|
|||
{
|
||||
if (!retain_splash)
|
||||
on_hide_splash (state);
|
||||
else
|
||||
quit_splash (state);
|
||||
ply_boot_splash_free (state->boot_splash);
|
||||
state->boot_splash = NULL;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue