aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authora-kenji <aks.kenji@protonmail.com>2021-05-29 20:53:32 +0200
committerGitHub <noreply@github.com>2021-05-29 20:53:32 +0200
commit80bd53b8f7607169037dde87161c5576ebd35b90 (patch)
treef3bff85328dc62d87728977faaa7a08dd3f6de0c /src
parentdocs(changelog): Add default_mode option (diff)
parentAdd default_mode to attach (diff)
downloadsl0ppij-80bd53b8f7607169037dde87161c5576ebd35b90.tar.gz
sl0ppij-80bd53b8f7607169037dde87161c5576ebd35b90.tar.xz
sl0ppij-80bd53b8f7607169037dde87161c5576ebd35b90.zip
Merge pull request #549 from a-kenji/default-mode-attach
Add default_mode to attach
Diffstat (limited to 'src')
-rw-r--r--src/main.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main.rs b/src/main.rs
index b9147fab..97ad3dee 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -13,6 +13,7 @@ use zellij_utils::{
cli::{CliArgs, Command, Sessions},
consts::{ZELLIJ_TMP_DIR, ZELLIJ_TMP_LOG_DIR},
input::config::Config,
+ input::options::Options,
logging::*,
setup::{get_default_data_dir, Setup},
structopt::StructOpt,
@@ -63,11 +64,14 @@ pub fn main() {
} else {
session_name = Some(get_active_session());
}
+
+ let config_options = Options::from_cli(&config.options, opts.command.clone());
+
start_client(
Box::new(os_input),
opts,
config,
- ClientInfo::Attach(session_name.unwrap(), force),
+ ClientInfo::Attach(session_name.unwrap(), force, config_options),
);
} else {
let session_name = opts