From 9bde3a460a24ae63fcd7bf68612ba0fc683786c6 Mon Sep 17 00:00:00 2001 From: giladogit <32686842+giladogit@users.noreply.github.com> Date: Fri, 6 Jul 2018 17:19:13 -0700 Subject: Update signals.c See issue #405 --- src/signals.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/signals.c') diff --git a/src/signals.c b/src/signals.c index c08d5df..97192fa 100644 --- a/src/signals.c +++ b/src/signals.c @@ -33,6 +33,7 @@ void setup_signal_handlers() { struct sigaction feh_sh; sigset_t feh_ss; + sig_exit = 0; if ( (sigemptyset(&feh_ss) == -1) || (sigaddset(&feh_ss, SIGUSR1) == -1) || @@ -86,7 +87,7 @@ void feh_handle_signal(int signo) case SIGQUIT: if (childpid) killpg(childpid, SIGINT); - exit(128 + signo); + sig_exit = 128 + signo; } winwid = winwidget_get_first_window_of_type(WIN_TYPE_SLIDESHOW); -- cgit v1.2.3 From 00d45a4d00f45ed378ec5b1f5ae002ca918e58be Mon Sep 17 00:00:00 2001 From: giladogit <32686842+giladogit@users.noreply.github.com> Date: Sat, 7 Jul 2018 11:03:07 -0700 Subject: Update signals.c --- src/signals.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/signals.c') diff --git a/src/signals.c b/src/signals.c index 97192fa..262423b 100644 --- a/src/signals.c +++ b/src/signals.c @@ -28,6 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "options.h" void feh_handle_signal(int); +int sig_exit; void setup_signal_handlers() { -- cgit v1.2.3 From 171ebcfe02f87212fd8d2080bcc6217e5962955b Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Tue, 17 Jul 2018 17:29:35 +0200 Subject: signals.c: Globally initialize sig_exit; return immediately after SIGTERM etc --- src/signals.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/signals.c') diff --git a/src/signals.c b/src/signals.c index 262423b..aeaf889 100644 --- a/src/signals.c +++ b/src/signals.c @@ -28,13 +28,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "options.h" void feh_handle_signal(int); -int sig_exit; +int sig_exit = 0; void setup_signal_handlers() { struct sigaction feh_sh; sigset_t feh_ss; - sig_exit = 0; if ( (sigemptyset(&feh_ss) == -1) || (sigaddset(&feh_ss, SIGUSR1) == -1) || @@ -89,6 +88,7 @@ void feh_handle_signal(int signo) if (childpid) killpg(childpid, SIGINT); sig_exit = 128 + signo; + return; } winwid = winwidget_get_first_window_of_type(WIN_TYPE_SLIDESHOW); -- cgit v1.2.3