From 2116b891568cc2f86ad375177ad84b286b90d84a Mon Sep 17 00:00:00 2001 From: Tiago Vignatti Date: Mon, 8 Aug 2011 05:52:59 -0700 Subject: [PATCH] compositor: Move signal handler initialization before module loading Signed-off-by: Tiago Vignatti --- compositor/compositor.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/compositor/compositor.c b/compositor/compositor.c index 177de54..680772d 100644 --- a/compositor/compositor.c +++ b/compositor/compositor.c @@ -2054,7 +2054,13 @@ int main(int argc, char *argv[]) display = wl_display_create(); - ec = NULL; + loop = wl_display_get_event_loop(display); + wl_event_loop_add_signal(loop, SIGTERM, on_term_signal, ec); + wl_event_loop_add_signal(loop, SIGINT, on_term_signal, ec); + wl_event_loop_add_signal(loop, SIGQUIT, on_term_signal, ec); + + wl_list_init(&child_process_list); + wl_event_loop_add_signal(loop, SIGCHLD, sigchld_handler, NULL); if (!backend) { if (getenv("WAYLAND_DISPLAY")) @@ -2095,14 +2101,6 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } - loop = wl_display_get_event_loop(ec->wl_display); - wl_event_loop_add_signal(loop, SIGTERM, on_term_signal, ec); - wl_event_loop_add_signal(loop, SIGINT, on_term_signal, ec); - wl_event_loop_add_signal(loop, SIGQUIT, on_term_signal, ec); - - wl_list_init(&child_process_list); - wl_event_loop_add_signal(loop, SIGCHLD, sigchld_handler, NULL); - wl_display_run(display); if (xserver) -- 2.7.4