diff options
author | Ray Strode <rstrode@redhat.com> | 2008-06-27 15:20:30 -0400 |
---|---|---|
committer | Ray Strode <rstrode@redhat.com> | 2008-06-27 15:21:49 -0400 |
commit | 21b8637cacd6669fb8b2247f182ce2e4b7f53f53 (patch) | |
tree | 1f72b49ded22b0c4351e83070a5f3fcf7a13b6a0 /src | |
parent | b95a46bf069608728f1e54322cc067610bc1e230 (diff) | |
download | plymouth-21b8637cacd6669fb8b2247f182ce2e4b7f53f53.tar.gz plymouth-21b8637cacd6669fb8b2247f182ce2e4b7f53f53.tar.xz plymouth-21b8637cacd6669fb8b2247f182ce2e4b7f53f53.zip |
If stop_watching_signal is called on a signal that isn't being watched, ignore
Previously it would assert. Really we should switch the api to have a signal_watch
object much like the fd_watch object we have for watch_fd.
Diffstat (limited to 'src')
-rw-r--r-- | src/libply/ply-event-loop.c | 3 | ||||
-rw-r--r-- | src/main.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/libply/ply-event-loop.c b/src/libply/ply-event-loop.c index 4c84f9d..2be07cd 100644 --- a/src/libply/ply-event-loop.c +++ b/src/libply/ply-event-loop.c @@ -810,7 +810,8 @@ ply_event_loop_stop_watching_signal (ply_event_loop_t *loop, node = ply_signal_dispatcher_find_source_node (loop->signal_dispatcher, signal_number); - assert (node != NULL); + if (node == NULL) + return; ply_signal_dispatcher_remove_source_node (loop->signal_dispatcher, node); } @@ -176,6 +176,7 @@ 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); @@ -183,8 +184,10 @@ on_hide_splash (state_t *state) state->boot_splash = NULL; } + ply_trace ("closing splash window"); if (state->window != NULL) { + ply_window_close (state->window); ply_window_free (state->window); state->window = NULL; } |