Add a cmdq_continue function rather than twiddling the flag directly.

10 files changed, 19 insertions, 11 deletions

diff --git a/cfg.c b/cfg.c
index c79150de..286ed460 100644
--- a/cfg.c
+++ b/cfg.c
@@ -53,7 +53,7 @@ cfg_done(__unused struct cmdq_item *item, __unused void *data)
 		cfg_show_causes(RB_MIN(sessions, &sessions));
 
 	if (cfg_item != NULL)
-		cfg_item->flags &= ~CMDQ_WAITING;
+		cmdq_continue(cfg_item);
 
 	status_prompt_load_history();
 
diff --git a/cmd-display-panes.c b/cmd-display-panes.c
index aeeb6936..aa665f08 100644
--- a/cmd-display-panes.c
+++ b/cmd-display-panes.c
@@ -188,7 +188,7 @@ cmd_display_panes_free(struct client *c)
 	struct cmd_display_panes_data	*cdata = c->overlay_data;
 
 	if (cdata->item != NULL)
-		cdata->item->flags &= ~CMDQ_WAITING;
+		cmdq_continue(cdata->item);
 	free(cdata->command);
 	free(cdata);
 }
diff --git a/cmd-if-shell.c b/cmd-if-shell.c
index f795575a..a992602c 100644
--- a/cmd-if-shell.c
+++ b/cmd-if-shell.c
@@ -196,7 +196,7 @@ cmd_if_shell_callback(struct job *job)
 
 out:
 	if (cdata->item != NULL)
-		cdata->item->flags &= ~CMDQ_WAITING;
+		cmdq_continue(cdata->item);
 }
 
 static void
diff --git a/cmd-load-buffer.c b/cmd-load-buffer.c
index 3e669093..cdf44bf7 100644
--- a/cmd-load-buffer.c
+++ b/cmd-load-buffer.c
@@ -176,7 +176,7 @@ cmd_load_buffer_callback(struct client *c, int closed, void *data)
 		free(cause);
 	}
 out:
-	cdata->item->flags &= ~CMDQ_WAITING;
+	cmdq_continue(cdata->item);
 
 	free(cdata->bufname);
 	free(cdata);
diff --git a/cmd-queue.c b/cmd-queue.c
index 1ee43508..ef68d5d5 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -156,6 +156,13 @@ cmdq_insert_hook(struct session *s, struct cmdq_item *item,
 	free(name);
 }
 
+/* Continue processing command queue. */
+void
+cmdq_continue(struct cmdq_item *item)
+{
+	item->flags &= ~CMDQ_WAITING;
+}
+
 /* Remove an item. */
 static void
 cmdq_remove(struct cmdq_item *item)
diff --git a/cmd-run-shell.c b/cmd-run-shell.c
index c9a478c7..2f45f492 100644
--- a/cmd-run-shell.c
+++ b/cmd-run-shell.c
@@ -155,7 +155,7 @@ cmd_run_shell_callback(struct job *job)
 	free(msg);
 
 	if (cdata->item != NULL)
-		cdata->item->flags &= ~CMDQ_WAITING;
+		cmdq_continue(cdata->item);
 }
 
 static void
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);
 		}
diff --git a/menu.c b/menu.c
index fd35399b..cc21c796 100644
--- a/menu.c
+++ b/menu.c
@@ -161,7 +161,7 @@ menu_free_cb(struct client *c)
 	struct menu_data	*md = c->overlay_data;
 
 	if (md->item != NULL)
-		md->item->flags &= ~CMDQ_WAITING;
+		cmdq_continue(md->item);
 
 	if (md->cb != NULL)
 		md->cb(md->menu, UINT_MAX, KEYC_NONE, md->data);
diff --git a/tmux.h b/tmux.h
index 3324acba..cc5e55c0 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2037,6 +2037,7 @@ void		 cmdq_insert_after(struct cmdq_item *, struct cmdq_item *);
 void		 cmdq_append(struct client *, struct cmdq_item *);
 void		 cmdq_insert_hook(struct session *, struct cmdq_item *,
 		     struct cmd_find_state *, const char *, ...);
+void		 cmdq_continue(struct cmdq_item *);
 void printflike(3, 4) cmdq_format(struct cmdq_item *, const char *,
 		     const char *, ...);
 u_int		 cmdq_next(struct client *);
diff --git a/window.c b/window.c
index e89cf96c..e7941c70 100644
--- a/window.c
+++ b/window.c
@@ -1512,7 +1512,7 @@ window_pane_input_callback(struct client *c, int closed, void *data)
 		c->stdin_callback = NULL;
 		server_client_unref(c);
 
-		cdata->item->flags &= ~CMDQ_WAITING;
+		cmdq_continue(cdata->item);
 		free(cdata);
 
 		return;