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

[client] Fix watch-keystroke cancellation

Browse source 
If someone calls --ignore-keystroke then
the watch-keystroke command shouldn't get
run and the exit code should be different
than if it does get run.
This commit is contained in:
Ray Strode 2010-06-30 16:04:14 -04:00
parent 6e09dd50ea
commit 3875c30854
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/client/plymouth.c
View file

@ -363,6 +363,13 @@ on_key_answer (key_answer_state_t *answer_state,
const char *answer,
ply_boot_client_t *client)
{
if (answer == NULL)
{
ply_event_loop_exit (answer_state->state->loop, 1);
return;
}
if (answer_state->command != NULL)
{
answer_via_command (answer_state->command, answer, NULL);
@ -373,9 +380,7 @@ on_key_answer (key_answer_state_t *answer_state,
write (STDOUT_FILENO, answer, strlen (answer));
}
if (answer != NULL)
ply_event_loop_exit (answer_state->state->loop, 0);
ply_event_loop_exit (answer_state->state->loop, 1);
ply_event_loop_exit (answer_state->state->loop, 0);
}
static void