summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2016-05-06 13:43:47 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-05-06 13:43:47 -0400
commit66a3fcb0130e2332ef54c8e67a8377f086a6f372 (patch)
tree12eaa8f23d8ede1f36b39cb6d2f02b5597a80cdd
parent3178064d30e6bfee79501da57dd4d76c3aac1163 (diff)
add SA_NOCLDWAIT to SIGCHLD flags when xwayland module loads
pulseaudio uses waitpid internally and will deadlock if ecore-audio performs a deferred connect
-rw-r--r--src/modules/xwayland/e_mod_main.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/modules/xwayland/e_mod_main.c b/src/modules/xwayland/e_mod_main.c
index 3e5c895f0..b43e3113e 100644
--- a/src/modules/xwayland/e_mod_main.c
+++ b/src/modules/xwayland/e_mod_main.c
@@ -448,6 +448,11 @@ E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "XWayland" };
448E_API void * 448E_API void *
449e_modapi_init(E_Module *m) 449e_modapi_init(E_Module *m)
450{ 450{
451 struct sigaction sa;
452
453 sigaction(SIGCHLD, NULL, &sa);
454 sa.sa_flags |= SA_NOCLDWAIT;
455 sigaction(SIGCHLD, &sa, NULL);
451 return xwl_init(m); 456 return xwl_init(m);
452} 457}
453 458