aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2019-06-01 19:02:26 +0100
committerThomas Adam <thomas@xteddy.org>2019-06-01 19:02:26 +0100
commit027a7ac829f100996e09700dc0e8abe2bfecb904 (patch)
tree09d286fea9af85387e2f561fa79e49ab4aea26b8
parent8382ae65b7445a70e8a24b541cf104eedadd7265 (diff)
parent2c6c3a1d27d3665a47d037965955d2bad1f81bcc (diff)
downloadrtmux-027a7ac829f100996e09700dc0e8abe2bfecb904.tar.gz
rtmux-027a7ac829f100996e09700dc0e8abe2bfecb904.tar.bz2
rtmux-027a7ac829f100996e09700dc0e8abe2bfecb904.zip
Merge branch 'obsd-master'
-rw-r--r--cmd-new-session.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/cmd-new-session.c b/cmd-new-session.c
index 2fd13420..559c268c 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -242,8 +242,13 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
/* Create the new session. */
oo = options_create(global_s_options);
- if (args_has(args, 'x') || args_has(args, 'y'))
+ if (args_has(args, 'x') || args_has(args, 'y')) {
+ if (!args_has(args, 'x'))
+ dsx = sx;
+ if (!args_has(args, 'y'))
+ dsy = sy;
options_set_string(oo, "default-size", 0, "%ux%u", dsx, dsy);
+ }
env = environ_create();
if (c != NULL && !args_has(args, 'E'))
environ_update(global_s_options, c->environ, env);