aboutsummaryrefslogtreecommitdiff
path: root/cmd-wait-for.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2019-06-18 13:02:28 +0100
committerThomas Adam <thomas@xteddy.org>2019-06-18 13:02:28 +0100
commitee9bc355f5fec07ef399d03002985e8bd5e117c5 (patch)
tree2bf31664c8bea7fcb66b7bde8561ef529ce7765b /cmd-wait-for.c
parent5895f1d9f742c9b4bcc1de3cf3bebe2601f673b3 (diff)
parent250fdd08bea74f47fc9a8962d5688db353896921 (diff)
downloadrtmux-ee9bc355f5fec07ef399d03002985e8bd5e117c5.tar.gz
rtmux-ee9bc355f5fec07ef399d03002985e8bd5e117c5.tar.bz2
rtmux-ee9bc355f5fec07ef399d03002985e8bd5e117c5.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-wait-for.c')
-rw-r--r--cmd-wait-for.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd-wait-for.c b/cmd-wait-for.c
index 33600eda..4f438a7f 100644
--- a/cmd-wait-for.c
+++ b/cmd-wait-for.c
@@ -153,7 +153,7 @@ cmd_wait_for_signal(__unused struct cmdq_item *item, const char *name,
log_debug("signal wait channel %s, with waiters", wc->name);
TAILQ_FOREACH_SAFE(wi, &wc->waiters, entry, wi1) {
- wi->item->flags &= ~CMDQ_WAITING;
+ cmdq_continue(wi->item);
TAILQ_REMOVE(&wc->waiters, wi, entry);
free(wi);
@@ -229,7 +229,7 @@ cmd_wait_for_unlock(struct cmdq_item *item, const char *name,
}
if ((wi = TAILQ_FIRST(&wc->lockers)) != NULL) {
- wi->item->flags &= ~CMDQ_WAITING;
+ cmdq_continue(wi->item);
TAILQ_REMOVE(&wc->lockers, wi, entry);
free(wi);
} else {
@@ -248,13 +248,13 @@ cmd_wait_for_flush(void)
RB_FOREACH_SAFE(wc, wait_channels, &wait_channels, wc1) {
TAILQ_FOREACH_SAFE(wi, &wc->waiters, entry, wi1) {
- wi->item->flags &= ~CMDQ_WAITING;
+ cmdq_continue(wi->item);
TAILQ_REMOVE(&wc->waiters, wi, entry);
free(wi);
}
wc->woken = 1;
TAILQ_FOREACH_SAFE(wi, &wc->lockers, entry, wi1) {
- wi->item->flags &= ~CMDQ_WAITING;
+ cmdq_continue(wi->item);
TAILQ_REMOVE(&wc->lockers, wi, entry);
free(wi);
}