aboutsummaryrefslogtreecommitdiffstats
path: root/sway
diff options
context:
space:
mode:
authorLibravatar Zandr Martin <zandrmartin@users.noreply.github.com>2016-06-11 17:10:38 -0500
committerLibravatar GitHub <noreply@github.com>2016-06-11 17:10:38 -0500
commita6f4bf60f2a6b9aa2ae5cadee5c1aada2ff1f6b3 (patch)
tree978577aae4b59ae33012fb8c181ab61b82279a97 /sway
parentimplement resize command for absolute dimensions (diff)
parentMerge pull request #708 from zandrmartin/assign-command (diff)
downloadsway-a6f4bf60f2a6b9aa2ae5cadee5c1aada2ff1f6b3.tar.gz
sway-a6f4bf60f2a6b9aa2ae5cadee5c1aada2ff1f6b3.tar.zst
sway-a6f4bf60f2a6b9aa2ae5cadee5c1aada2ff1f6b3.zip
Merge branch 'master' into set-size-command
Diffstat (limited to 'sway')
-rw-r--r--sway/config.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sway/config.c b/sway/config.c
index 819a70ce..766d2b23 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -101,6 +101,7 @@ static void pid_workspace_cleanup() {
101 pw = config->pid_workspaces->items[i]; 101 pw = config->pid_workspaces->items[i];
102 102
103 if (difftime(ts.tv_sec, *pw->time_added) >= PID_WORKSPACE_TIMEOUT) { 103 if (difftime(ts.tv_sec, *pw->time_added) >= PID_WORKSPACE_TIMEOUT) {
104 free_pid_workspace(config->pid_workspaces->items[i]);
104 list_del(config->pid_workspaces, i); 105 list_del(config->pid_workspaces, i);
105 } 106 }
106 } 107 }
@@ -126,6 +127,7 @@ void pid_workspace_add(struct pid_workspace *pw) {
126 list_pw = config->pid_workspaces->items[i]; 127 list_pw = config->pid_workspaces->items[i];
127 128
128 if (pw->pid == list_pw->pid) { 129 if (pw->pid == list_pw->pid) {
130 free_pid_workspace(config->pid_workspaces->items[i]);
129 list_del(config->pid_workspaces, i); 131 list_del(config->pid_workspaces, i);
130 } 132 }
131 } 133 }