fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-04-30 23:47:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[main] fix bug with multiple quit commands

Browse source 
Likewise if plymouth quit is called when we're waiting for the boot
splash to become idle, we also end up asserting that there's not
already an idle trigger.

Fix it in the same way as deactive, ignore the second quit command
except for pulling its trigger.
This commit is contained in:
Scott James Remnant 2010-03-18 20:29:05 +00:00 • committed by Ray Strode
parent 434a4b2ae8
commit 8ca85f9ab3
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main.c
View file

@ -786,15 +786,20 @@ on_quit (state_t *state,
bool retain_splash,
ply_trigger_t *quit_trigger)
{
if (state->quit_trigger != NULL)
{
ply_trigger_pull (quit_trigger, NULL);
return;
}
state->quit_trigger = quit_trigger;
state->should_retain_splash = retain_splash;
ply_trace ("time to quit, closing log");
if (state->session != NULL)
ply_terminal_session_close_log (state->session);
ply_trace ("unloading splash");
state->should_retain_splash = retain_splash;
state->quit_trigger = quit_trigger;
if (state->boot_splash != NULL)
{
ply_boot_splash_become_idle (state->boot_splash,