diff options
author | Drew DeVault <sir@cmpwn.com> | 2017-06-14 18:14:22 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-14 18:14:22 -0400 |
commit | 0fc9628f03984caa04e200a1dc458d1cf7fc6d6c (patch) | |
tree | e3c567c4684faf0f9a7f77494f1bf638171d5349 /swaybar | |
parent | Force focus on unmanaged views during pointer test (diff) | |
parent | Merge pull request #1236 from ykrivopalov/fix_complex_status_command (diff) | |
download | sway-0fc9628f03984caa04e200a1dc458d1cf7fc6d6c.tar.gz sway-0fc9628f03984caa04e200a1dc458d1cf7fc6d6c.tar.zst sway-0fc9628f03984caa04e200a1dc458d1cf7fc6d6c.zip |
Merge branch 'master' into tray
Diffstat (limited to 'swaybar')
-rw-r--r-- | swaybar/bar.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/swaybar/bar.c b/swaybar/bar.c index 5e87eac9..3412ff29 100644 --- a/swaybar/bar.c +++ b/swaybar/bar.c | |||
@@ -41,6 +41,7 @@ static void spawn_status_cmd_proc(struct bar *bar) { | |||
41 | close(pipefd[0]); | 41 | close(pipefd[0]); |
42 | dup2(pipefd[1], STDOUT_FILENO); | 42 | dup2(pipefd[1], STDOUT_FILENO); |
43 | close(pipefd[1]); | 43 | close(pipefd[1]); |
44 | setpgid(bar->status_command_pid, 0); | ||
44 | char *const cmd[] = { | 45 | char *const cmd[] = { |
45 | "sh", | 46 | "sh", |
46 | "-c", | 47 | "-c", |
@@ -290,7 +291,7 @@ static void free_outputs(list_t *outputs) { | |||
290 | static void terminate_status_command(pid_t pid) { | 291 | static void terminate_status_command(pid_t pid) { |
291 | if (pid) { | 292 | if (pid) { |
292 | // terminate status_command process | 293 | // terminate status_command process |
293 | int ret = kill(pid, SIGTERM); | 294 | int ret = killpg(pid, SIGTERM); |
294 | if (ret != 0) { | 295 | if (ret != 0) { |
295 | sway_log(L_ERROR, "Unable to terminate status_command [pid: %d]", pid); | 296 | sway_log(L_ERROR, "Unable to terminate status_command [pid: %d]", pid); |
296 | } else { | 297 | } else { |