diff options
| author | a-kenji <aks.kenji@protonmail.com> | 2021-07-01 22:24:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-01 22:24:01 +0200 |
| commit | 81941be1344ed33aee0f3e7f80ff040004e2df79 (patch) | |
| tree | c996204dd6712342c744db0c78fb8a193be9d34c | |
| parent | docs(changelog): Add option for default-shell (diff) | |
| parent | Improve loading of default shell slightly (diff) | |
| download | sl0ppij-81941be1344ed33aee0f3e7f80ff040004e2df79.tar.gz sl0ppij-81941be1344ed33aee0f3e7f80ff040004e2df79.tar.xz sl0ppij-81941be1344ed33aee0f3e7f80ff040004e2df79.zip | |
Merge pull request #595 from a-kenji/load-default-shell
Improve loading of default shell slightly
| -rw-r--r-- | zellij-server/src/lib.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/zellij-server/src/lib.rs b/zellij-server/src/lib.rs index bb642ecb..6618c0a7 100644 --- a/zellij-server/src/lib.rs +++ b/zellij-server/src/lib.rs @@ -217,7 +217,7 @@ pub fn start_server(os_input: Box<dyn ServerOsApi>, socket_path: PathBuf) { let session = init_session( os_input.clone(), opts, - config_options, + config_options.clone(), to_server.clone(), client_attributes, session_state.clone(), @@ -226,12 +226,12 @@ pub fn start_server(os_input: Box<dyn ServerOsApi>, socket_path: PathBuf) { *session_data.write().unwrap() = Some(session); *session_state.write().unwrap() = SessionState::Attached; - let default_shell = session_data - .read() - .unwrap() - .as_ref() - .map(|session| session.default_shell.clone()) - .flatten(); + let default_shell = config_options.default_shell.map(|shell| { + TerminalAction::RunCommand(RunCommand { + command: shell, + ..Default::default() + }) + }); session_data .read() |