mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-11 13:04:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1236 from ykrivopalov/fix_complex_status_command

Browse Source 
swaybar: Group child processes for signalling
This commit is contained in:
Drew DeVault 2017-06-12 18:03:25 -04:00 committed by GitHub
commit 16e20ec251
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swaybar/bar.c
View File

@ -34,6 +34,7 @@ static void spawn_status_cmd_proc(struct bar *bar) {
close(pipefd[0]); close(pipefd[0]);
dup2(pipefd[1], STDOUT_FILENO); dup2(pipefd[1], STDOUT_FILENO);
close(pipefd[1]); close(pipefd[1]);
setpgid(bar->status_command_pid, 0);
char *const cmd[] = { char *const cmd[] = {
"sh", "sh",
"-c", "-c",
@ -274,7 +275,7 @@ static void free_outputs(list_t *outputs) {
static void terminate_status_command(pid_t pid) { static void terminate_status_command(pid_t pid) {
if (pid) { if (pid) {
// terminate status_command process // terminate status_command process
int ret = kill(pid, SIGTERM); int ret = killpg(pid, SIGTERM);
if (ret != 0) { if (ret != 0) {
sway_log(L_ERROR, "Unable to terminate status_command [pid: %d]", pid); sway_log(L_ERROR, "Unable to terminate status_command [pid: %d]", pid);
} else { } else {