leyoda/cosmic-terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tweak: make options and tab_title_override not mut

Browse source
This commit is contained in:
Adil Hanney 2026-02-16 23:47:47 +00:00
parent 75cfa52673
commit 7848e64bab
No known key found for this signature in database
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/main.rs
View file

@ -1523,14 +1523,13 @@ impl App {
Some(colors) => { Some(colors) => {
let current_pane = self.pane_model.focused(); let current_pane = self.pane_model.focused();
if let Some(tab_model) = self.pane_model.active_mut() { if let Some(tab_model) = self.pane_model.active_mut() {
let mut options = self.startup_options.take().unwrap_or_default(); let (options, tab_title_override) = if let Some(profile) = profile_id_opt
let mut tab_title_override = None;
if let Some(profile) = profile_id_opt
.and_then(|profile_id| self.config.profiles.get(&profile_id)) .and_then(|profile_id| self.config.profiles.get(&profile_id))
{ {
// Merge profile and startup options, preferring startup options // Merge profile and startup options, preferring startup options
options = tty::Options { let startup_options = self.startup_options.take().unwrap_or_default();
shell: options.shell.or_else(|| { let options = tty::Options {
shell: startup_options.shell.or_else(|| {
if let Some(mut args) = shlex::split(&profile.command) { if let Some(mut args) = shlex::split(&profile.command) {
if !args.is_empty() { if !args.is_empty() {
let command = args.remove(0); let command = args.remove(0);
@ -1539,19 +1538,22 @@ impl App {
} }
return None; return None;
}), }),
working_directory: options.working_directory.or_else(|| { working_directory: startup_options.working_directory.or_else(|| {
(!profile.working_directory.is_empty()) (!profile.working_directory.is_empty())
.then(|| profile.working_directory.clone().into()) .then(|| profile.working_directory.clone().into())
}), }),
drain_on_exit: options.drain_on_exit || profile.drain_on_exit, drain_on_exit: startup_options.drain_on_exit || profile.drain_on_exit,
..options ..startup_options
}; };
tab_title_override = if profile.tab_title.is_empty() { let tab_title_override = if profile.tab_title.is_empty() {
None None
} else { } else {
Some(profile.tab_title.clone()) Some(profile.tab_title.clone())
}; };
} (options, tab_title_override)
} else {
(self.startup_options.take().unwrap_or_default(), None)
};
let entity = tab_model let entity = tab_model
.insert() .insert()