===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-run-shell.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- src/usr.bin/tmux/cmd-run-shell.c	2016/10/16 19:04:05	1.41
+++ src/usr.bin/tmux/cmd-run-shell.c	2016/11/11 11:37:25	1.42
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-run-shell.c,v 1.41 2016/10/16 19:04:05 nicm Exp $ */
+/* $OpenBSD: cmd-run-shell.c,v 1.42 2016/11/11 11:37:25 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -62,7 +62,7 @@
 
 	if (cdata->wp_id != -1)
 		wp = window_pane_find_by_id(cdata->wp_id);
-	if (wp == NULL) {
+	if (cdata->item != NULL && wp == NULL) {
 		cmdq_print(cdata->item, "%s", msg);
 		return;
 	}
@@ -99,11 +99,6 @@
 
 	cdata = xcalloc(1, sizeof *cdata);
 	cdata->cmd = shellcmd;
-
-	if (args_has(args, 't') && wp != NULL)
-		cdata->wp_id = wp->id;
-	else
-		cdata->wp_id = -1;
 
 	if (args_has(args, 't') && wp != NULL)
 		cdata->wp_id = wp->id;