From ef69644f1b0b63e68e1363eddebcea70e50a5e2d Mon Sep 17 00:00:00 2001 From: a-kenji Date: Mon, 10 May 2021 17:42:59 +0200 Subject: [PATCH] fixup! Add Option for Simplified Layout * merge structop and serde structs --- example/default.yaml | 2 +- src/server/mod.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/example/default.yaml b/example/default.yaml index 032ddac98..a113c8eed 100644 --- a/example/default.yaml +++ b/example/default.yaml @@ -1,5 +1,5 @@ --- -simplified_ui: false +simplified_ui: true keybinds: unbind: true normal: diff --git a/src/server/mod.rs b/src/server/mod.rs index 6b9c52b56..58a92c557 100644 --- a/src/server/mod.rs +++ b/src/server/mod.rs @@ -306,8 +306,8 @@ fn init_session( let send_pty_instructions = send_pty_instructions.clone(); let send_server_instructions = send_server_instructions; let max_panes = opts.max_panes; - let capabilities = if let Some(ConfigCli::Options { simplified_ui }) = opts.option { - simplified_ui + let capabilities = if let Some(ConfigCli::Options(options)) = opts.option { + options.simplified_ui } else { config_options.simplified_ui };