The branch, hooks has been updated
via d12b830caca60c2c3b888e66c967283d9dcef620 (commit)
from e86b8a5633eb459240f9705223a8be65989e27fc (commit)
- Log -----------------------------------------------------------------
commit d12b830caca60c2c3b888e66c967283d9dcef620
Author: Thomas Adam <tho...@xteddy.org>
Commit: Thomas Adam <tho...@xteddy.org>
cmd_continue_one: Use correct struct cmd with hooks
Don't use cmdq->cmd when extracting the command to use with hooks; cmdq->cmd
can be NULL at the point of checking hooks. Use 'cmd' already ascertained.
---
cmd-queue.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmd-queue.c b/cmd-queue.c
index 721d674..d842f00 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -259,7 +259,7 @@ cmdq_continue_one(struct cmd_q *cmdq)
if (~cmdq->flags & CMD_Q_REENTRY) {
cmdq->flags |= CMD_Q_REENTRY;
if (cmdq_hooks_run(hooks, "before",
- cmdq->cmd->entry->name,cmdq)) {
+ cmd->entry->name,cmdq)) {
return (CMD_RETURN_WAIT);
}
}
@@ -274,7 +274,7 @@ cmdq_continue_one(struct cmd_q *cmdq)
goto error;
if (hooks != NULL && cmdq_hooks_run(hooks, "after",
- cmdq->cmd->entry->name, cmdq)) {
+ cmd->entry->name, cmdq)) {
retval = CMD_RETURN_WAIT;
}
cmdq_guard(cmdq, "end", flags);
-----------------------------------------------------------------------
Summary of changes:
cmd-queue.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
