From 6e34bc32a01431267d8be976b1f67f0fb90ed6ce Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Tue, 3 Mar 2015 09:54:23 -0500 Subject: [PATCH] don't install SIGBUS handler if we are running wayland-only Wayland shm sets up a sigbus handler for catching invalid shm region access. If we setup our sigbus handler here, then the wl-shm sigbus handler will not function properly Signed-off-by: Chris Michael --- src/bin/e_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/e_main.c b/src/bin/e_main.c index a185887cd..d7bb2c1ba 100644 --- a/src/bin/e_main.c +++ b/src/bin/e_main.c @@ -255,10 +255,12 @@ main(int argc, char **argv) sigemptyset(&action.sa_mask); sigaction(SIGFPE, &action, NULL); +#ifndef HAVE_WAYLAND_ONLY action.sa_sigaction = e_sigbus_act; action.sa_flags = SA_NODEFER | SA_RESETHAND | SA_SIGINFO; sigemptyset(&action.sa_mask); sigaction(SIGBUS, &action, NULL); +#endif action.sa_sigaction = e_sigabrt_act; action.sa_flags = SA_NODEFER | SA_RESETHAND | SA_SIGINFO;