compositor: Move signal handler initialization before module loading
authorTiago Vignatti <tiago.vignatti@intel.com>
Mon, 8 Aug 2011 12:52:59 +0000 (05:52 -0700)
committerKristian Høgsberg <krh@bitplanet.net>
Thu, 11 Aug 2011 19:15:30 +0000 (15:15 -0400)
Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
compositor/compositor.c

index 177de54..680772d 100644 (file)
@@ -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)