===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-queue.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- src/usr.bin/tmux/cmd-queue.c	2017/04/21 18:18:17	1.50
+++ src/usr.bin/tmux/cmd-queue.c	2017/04/21 20:26:34	1.51
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-queue.c,v 1.50 2017/04/21 18:18:17 nicm Exp $ */
+/* $OpenBSD: cmd-queue.c,v 1.51 2017/04/21 20:26:34 nicm Exp $ */
 
 /*
  * Copyright (c) 2013 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -216,11 +216,12 @@
 		name = cmd->entry->name;
 		if (cmd_find_valid_state(&item->state.tflag))
 			fsp = &item->state.tflag;
-		else {
-			if (cmd_find_current(&fs, item, CMD_FIND_QUIET) != 0)
-				goto out;
+		else if (cmd_find_valid_state(&item->shared->current))
+			fsp = &item->shared->current;
+		else if (cmd_find_from_client(&fs, item->client) == 0)
 			fsp = &fs;
-		}
+		else
+			goto out;
 		hooks_insert(fsp->s->hooks, item, fsp, "after-%s", name);
 	}