===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-display-panes.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- src/usr.bin/tmux/cmd-display-panes.c	2017/08/16 12:12:54	1.20
+++ src/usr.bin/tmux/cmd-display-panes.c	2018/08/02 07:55:16	1.21
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-display-panes.c,v 1.20 2017/08/16 12:12:54 nicm Exp $ */
+/* $OpenBSD: cmd-display-panes.c,v 1.21 2018/08/02 07:55:16 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -55,6 +55,7 @@
 
 	if ((c = cmd_find_client(item, args_get(args, 't'), 0)) == NULL)
 		return (CMD_RETURN_ERROR);
+	s = c->session;
 
 	if (c->identify_callback != NULL)
 		return (CMD_RETURN_NORMAL);
@@ -64,7 +65,7 @@
 		c->identify_callback_data = xstrdup(args->argv[0]);
 	else
 		c->identify_callback_data = xstrdup("select-pane -t '%%'");
-	s = c->session;
+	c->identify_callback_item = item;
 
 	if (args_has(args, 'd')) {
 		delay = args_strtonum(args, 'd', 0, UINT_MAX, &cause);
@@ -77,7 +78,7 @@
 		delay = options_get_number(s->options, "display-panes-time");
 	server_client_set_identify(c, delay);
 
-	return (CMD_RETURN_NORMAL);
+	return (CMD_RETURN_WAIT);
 }
 
 static enum cmd_retval
@@ -96,34 +97,36 @@
 {
 	struct cmd_list		*cmdlist;
 	struct cmdq_item	*new_item;
-	char			*template, *cmd, *expanded, *cause;
+	char			*cmd, *expanded, *cause;
 
-	template = c->identify_callback_data;
 	if (wp == NULL)
 		goto out;
+
 	xasprintf(&expanded, "%%%u", wp->id);
-	cmd = cmd_template_replace(template, expanded, 1);
+	cmd = cmd_template_replace(c->identify_callback_data, expanded, 1);
 
 	cmdlist = cmd_string_parse(cmd, NULL, 0, &cause);
-	if (cmdlist == NULL) {
-		if (cause != NULL) {
-			new_item = cmdq_get_callback(cmd_display_panes_error,
-			    cause);
-		} else
-			new_item = NULL;
-	} else {
+	if (cmdlist == NULL && cause != NULL)
+		new_item = cmdq_get_callback(cmd_display_panes_error, cause);
+	else if (cmdlist == NULL)
+		new_item = NULL;
+	else {
 		new_item = cmdq_get_command(cmdlist, NULL, NULL, 0);
 		cmd_list_free(cmdlist);
 	}
 
 	if (new_item != NULL)
-		cmdq_append(c, new_item);
+		cmdq_insert_after(c->identify_callback_item, new_item);
 
 	free(cmd);
 	free(expanded);
 
 out:
+	c->identify_callback_item->flags &= ~CMDQ_WAITING;
+	c->identify_callback_item = NULL;
+
 	free(c->identify_callback_data);
 	c->identify_callback_data = NULL;
+
 	c->identify_callback = NULL;
 }