pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #595 from a-kenji/load-default-shell

Browse source 
Improve loading of default shell slightly
This commit is contained in:
a-kenji 2021-07-01 22:24:01 +02:00 • committed by GitHub
commit 81941be134
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
zellij-server/src/lib.rs
View file

@ -217,7 +217,7 @@ pub fn start_server(os_input: Box<dyn ServerOsApi>, socket_path: PathBuf) {
let session = init_session( let session = init_session(
os_input.clone(), os_input.clone(),
opts, opts,
config_options, config_options.clone(),
to_server.clone(), to_server.clone(),
client_attributes, client_attributes,
session_state.clone(), 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_data.write().unwrap() = Some(session);
*session_state.write().unwrap() = SessionState::Attached; *session_state.write().unwrap() = SessionState::Attached;
let default_shell = session_data let default_shell = config_options.default_shell.map(|shell| {
.read() TerminalAction::RunCommand(RunCommand {
.unwrap() command: shell,
.as_ref() ..Default::default()
.map(|session| session.default_shell.clone()) })
.flatten(); });
session_data session_data
.read() .read()