diff options
| author | nicm <nicm> | 2015-04-25 18:09:28 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2015-04-25 18:09:28 +0000 |
| commit | 6dbd63ba4f2da666d55267692c610b9ed8d1d8dd (patch) | |
| tree | 371fc59e074cf40d3ac07964916dd64d1953bfc7 /cmd-attach-session.c | |
| parent | d23af6cca0c4d55097d567bbfea42aecf0ca36b0 (diff) | |
| download | rtmux-6dbd63ba4f2da666d55267692c610b9ed8d1d8dd.tar.gz rtmux-6dbd63ba4f2da666d55267692c610b9ed8d1d8dd.tar.bz2 rtmux-6dbd63ba4f2da666d55267692c610b9ed8d1d8dd.zip | |
Move the functions to convert ids from strings into session.c and window.c.
Diffstat (limited to 'cmd-attach-session.c')
| -rw-r--r-- | cmd-attach-session.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cmd-attach-session.c b/cmd-attach-session.c index 79e14616..46d568b4 100644 --- a/cmd-attach-session.c +++ b/cmd-attach-session.c @@ -69,9 +69,12 @@ cmd_attach_session(struct cmd_q *cmdq, const char *tflag, int dflag, int rflag, } 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); } |