diff options
| author | Thomas Adam <thomas@xteddy.org> | 2020-04-09 16:01:45 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2020-04-09 16:01:45 +0100 |
| commit | 52e3d960e7ebe2006509d48c427ffd8f25a0cf52 (patch) | |
| tree | 8f6deb3d44616e92ff05735b4c587dfe3c5d8235 /cmd-new-session.c | |
| parent | 916c3787d7464f66287f83814d563ff36ff3a96a (diff) | |
| parent | 26f5dfbe46c75f8b907ee75daaadde9a310d8dfb (diff) | |
| download | rtmux-52e3d960e7ebe2006509d48c427ffd8f25a0cf52.tar.gz rtmux-52e3d960e7ebe2006509d48c427ffd8f25a0cf52.tar.bz2 rtmux-52e3d960e7ebe2006509d48c427ffd8f25a0cf52.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-new-session.c')
| -rw-r--r-- | cmd-new-session.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/cmd-new-session.c b/cmd-new-session.c index a75fc972..725448fd 100644 --- a/cmd-new-session.c +++ b/cmd-new-session.c @@ -207,7 +207,8 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item) goto fail; } } - } + } else + dsx = 80; if (args_has(args, 'y')) { tmp = args_get(args, 'y'); if (strcmp(tmp, "-") == 0) { @@ -222,7 +223,8 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item) goto fail; } } - } + } else + dsy = 24; /* Find new session size. */ if (!detached && !is_control) { @@ -233,13 +235,14 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item) } else { tmp = options_get_string(global_s_options, "default-size"); if (sscanf(tmp, "%ux%u", &sx, &sy) != 2) { - sx = 80; - sy = 24; - } - if (args_has(args, 'x')) sx = dsx; - if (args_has(args, 'y')) sy = dsy; + } else { + if (args_has(args, 'x')) + sx = dsx; + if (args_has(args, 'y')) + sy = dsy; + } } if (sx == 0) sx = 1; |