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

main: if deactivate when already deactivated return immediately

Browse source 
We were trying to ignore second deactivate requests, but
were instead crashing because we're trying to use a nullified
trigger.

This commit makes sure things don't go crashy when a user
does "plymouth deactivate" on an already deactivated plymouthd.
This commit is contained in:
Ray Strode 2012-11-01 17:04:33 -04:00
parent f3b9d25f29
commit 6ccedf7b6e
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main.c
View file

@ -1135,7 +1135,13 @@ static void
on_deactivate (state_t *state,
ply_trigger_t *deactivate_trigger)
{
if ((state->deactivate_trigger != NULL) || state->is_inactive)
if (state->is_inactive)
{
ply_trigger_pull (deactivate_trigger, NULL);
return;
}
if (state->deactivate_trigger != NULL)
{
ply_trigger_add_handler (state->deactivate_trigger,
(ply_trigger_handler_t)