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

Revert "Check if a Config message was handled before creating first tab"

Browse source 
This reverts commit 7b152bd218.
This commit is contained in:
Jeremy Soller 2024-01-02 13:03:55 -07:00
parent 7b152bd218
commit 1e0ce2b7e7
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main.rs
View file

@ -184,7 +184,6 @@ pub struct App {
context_page: ContextPage, context_page: ContextPage,
term_event_tx_opt: Option<mpsc::Sender<(segmented_button::Entity, TermEvent)>>, term_event_tx_opt: Option<mpsc::Sender<(segmented_button::Entity, TermEvent)>>,
term_config: TermConfig, term_config: TermConfig,
config_subscribed: bool,
} }
impl App { impl App {
@ -385,7 +384,6 @@ impl Application for App {
context_page: ContextPage::Settings, context_page: ContextPage::Settings,
term_config: flags.term_config, term_config: flags.term_config,
term_event_tx_opt: None, term_event_tx_opt: None,
config_subscribed: false,
}; };
let command = app.update_title(); let command = app.update_title();
@ -407,7 +405,6 @@ impl Application for App {
self.config = config; self.config = config;
return self.update_config(); return self.update_config();
} }
self.config_subscribed = true;
} }
Message::Copy(entity_opt) => { Message::Copy(entity_opt) => {
let entity = entity_opt.unwrap_or_else(|| self.tab_model.active()); let entity = entity_opt.unwrap_or_else(|| self.tab_model.active());
@ -547,9 +544,8 @@ impl Application for App {
_ => {} _ => {}
} }
} }
Message::TabNew => match (self.config_subscribed, &self.term_event_tx_opt) { Message::TabNew => match &self.term_event_tx_opt {
(false, _) => log::info!("must wait for config subscription before creating first tab"), Some(term_event_tx) => match self.themes.get(self.config.syntax_theme()) {
(true, Some(term_event_tx)) => match self.themes.get(self.config.syntax_theme()) {
Some(colors) => { Some(colors) => {
let entity = self let entity = self
.tab_model .tab_model
@ -576,7 +572,7 @@ impl Application for App {
//TODO: fall back to known good theme //TODO: fall back to known good theme
} }
}, },
(true, None) => { None => {
log::warn!("tried to create new tab before having event channel"); log::warn!("tried to create new tab before having event channel");
} }
}, },