diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-04-25 20:45:02 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-04-25 20:45:02 +0000 |
| commit | 72e9ebf2ece28c986050162bf4f401a6a7679f53 (patch) | |
| tree | c31a424328859542a7a1248a9e411aac8fc5b3e9 /cmd-switch-client.c | |
| parent | 56e1132db485aeb0730ce7782533ca441e63afef (diff) | |
| parent | a568b9cadce002f6f7e8ee914c995242bd70cce5 (diff) | |
| download | rtmux-72e9ebf2ece28c986050162bf4f401a6a7679f53.tar.gz rtmux-72e9ebf2ece28c986050162bf4f401a6a7679f53.tar.bz2 rtmux-72e9ebf2ece28c986050162bf4f401a6a7679f53.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-switch-client.c')
| -rw-r--r-- | cmd-switch-client.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cmd-switch-client.c b/cmd-switch-client.c index 8c4daf97..18de0eb1 100644 --- a/cmd-switch-client.c +++ b/cmd-switch-client.c @@ -99,10 +99,12 @@ cmd_switch_client_exec(struct cmd *self, struct cmd_q *cmdq) } else { if ((s = cmd_find_session(cmdq, tflag, 1)) == NULL) return (CMD_RETURN_ERROR); - w = cmd_lookup_windowid(tflag); - if (w == NULL && - (wp = cmd_lookup_paneid(tflag)) != NULL) - w = wp->window; + w = window_find_by_id_str(tflag); + if (w == NULL) { + wp = window_pane_find_by_id_str(tflag); + if (wp != NULL) + w = wp->window; + } if (w != NULL) wl = winlink_find_by_window(&s->windows, w); } |