diff options
| author | a-kenji <aks.kenji@protonmail.com> | 2021-05-30 15:17:55 +0200 |
|---|---|---|
| committer | a-kenji <aks.kenji@protonmail.com> | 2021-05-30 15:17:55 +0200 |
| commit | 0be151fa28b6b0634271091f961048e8318fddc2 (patch) | |
| tree | 382d3e3fe0a73ff127e19dd693589bcca824b842 /src | |
| parent | Add color theme config (diff) | |
| parent | docs(changelog): Add default_mode to attach 549 (diff) | |
| download | sl0ppij-0be151fa28b6b0634271091f961048e8318fddc2.tar.gz sl0ppij-0be151fa28b6b0634271091f961048e8318fddc2.tar.xz sl0ppij-0be151fa28b6b0634271091f961048e8318fddc2.zip | |
Merge branch 'main' of https://github.com/zellij-org/zellij into theme-config
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.rs | 6 |
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 |