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

main: don't show splash from cancel_pending_delayed_show

Browse source 
It was a weird to show something in a function called "cancel..show"

Instead move the logic to the one caller that actually needed that
functionality (on_ask_for_password)
This commit is contained in:
Ray Strode 2014-02-05 15:09:13 -05:00
parent f30df6c440
commit e41af2d645
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/main.c
View file

@ -482,8 +482,6 @@ show_default_splash (state_t *state)
static void
cancel_pending_delayed_show (state_t *state)
{
bool has_open_seats;
if (isnan (state->splash_delay))
return;
@ -492,13 +490,6 @@ cancel_pending_delayed_show (state_t *state)
show_splash,
state);
state->splash_delay = NAN;
has_open_seats = ply_device_manager_has_open_seats (state->device_manager);
if (state->is_shown && has_open_seats)
{
ply_trace ("splash delay cancelled, showing splash immediately");
show_splash (state);
}
}
static void
@ -515,8 +506,21 @@ on_ask_for_password (state_t *state,
*/
if (state->is_shown)
{
ply_trace ("splash still coming up, waiting a bit");
bool has_open_seats;
cancel_pending_delayed_show (state);
has_open_seats = ply_device_manager_has_open_seats (state->device_manager);
if (has_open_seats)
{
ply_trace ("seats open now, showing splash immediately");
show_splash (state);
}
else
{
ply_trace ("splash still coming up, waiting a bit");
}
}
else
{