Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed name issue

Browse source
This commit is contained in:
Mikayla Maki 2022-08-22 13:38:23 -07:00
parent 7efeb0662a
commit 0450380e97
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/settings/src/settings.rs
View file

@ -146,7 +146,7 @@ pub enum WorkingDirectory {
#[derive(Clone, Debug, Default, Deserialize, JsonSchema)] #[derive(Clone, Debug, Default, Deserialize, JsonSchema)]
pub struct SettingsFileContent { pub struct SettingsFileContent {
#[serde(default)] #[serde(default)]
pub nightly: Option<FeatureFlags>, pub experiments: Option<FeatureFlags>,
#[serde(default)] #[serde(default)]
pub projects_online_by_default: Option<bool>, pub projects_online_by_default: Option<bool>,
#[serde(default)] #[serde(default)]
@ -256,7 +256,7 @@ impl Settings {
); );
merge(&mut self.vim_mode, data.vim_mode); merge(&mut self.vim_mode, data.vim_mode);
merge(&mut self.autosave, data.autosave); merge(&mut self.autosave, data.autosave);
merge(&mut self.experiments, data.nightly); merge(&mut self.experiments, data.experiments);
// Ensure terminal font is loaded, so we can request it in terminal_element layout // Ensure terminal font is loaded, so we can request it in terminal_element layout
if let Some(terminal_font) = &data.terminal.font_family { if let Some(terminal_font) = &data.terminal.font_family {
font_cache.load_family(&[terminal_font]).log_err(); font_cache.load_family(&[terminal_font]).log_err();