diff options
| author | Thomas Adam <thomas@xteddy.org> | 2014-10-21 07:11:44 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2014-10-21 07:11:44 +0100 |
| commit | 562af864bd8ab06c416075b5742ce3bbcf6d0610 (patch) | |
| tree | 2c3900dd6b284aa52441c3fde9dfdf8383d87b54 /client.c | |
| parent | b6aef2490f086f3404f439308bb1746ec5134e9a (diff) | |
| parent | 0a1a88d63caf3a0e8b4440686e73e1f0f690e03c (diff) | |
| download | rtmux-562af864bd8ab06c416075b5742ce3bbcf6d0610.tar.gz rtmux-562af864bd8ab06c416075b5742ce3bbcf6d0610.tar.bz2 rtmux-562af864bd8ab06c416075b5742ce3bbcf6d0610.zip | |
Merge branch 'obsd-master'
Conflicts:
Makefile
cmd-list-commands.c
cmd-suspend-client.c
job.c
tmux.h
xmalloc.c
Diffstat (limited to 'client.c')
| -rw-r--r-- | client.c | 13 |
1 files changed, 5 insertions, 8 deletions
@@ -26,6 +26,7 @@ #include <errno.h> #include <event.h> #include <fcntl.h> +#include <signal.h> #include <stdlib.h> #include <string.h> #include <unistd.h> @@ -437,15 +438,11 @@ client_signal(int sig, unused short events, unused void *data) struct sigaction sigact; int status; - if (!client_attached) { - switch (sig) { - case SIGCHLD: - waitpid(WAIT_ANY, &status, WNOHANG); - break; - case SIGTERM: + if (sig == SIGCHLD) + waitpid(WAIT_ANY, &status, WNOHANG); + else if (!client_attached) { + if (sig == SIGTERM) event_loopexit(NULL); - break; - } } else { switch (sig) { case SIGHUP: |