From 1e0ce2b7e7d5e3deb38dbd9f7ef2dc57b2164469 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 2 Jan 2024 13:03:55 -0700 Subject: [PATCH] Revert "Check if a Config message was handled before creating first tab" This reverts commit 7b152bd2189ffd8e0ed46cdf9364437732ba0580. --- src/main.rs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main.rs b/src/main.rs index a2d1d78..4fc0322 100644 --- a/src/main.rs +++ b/src/main.rs @@ -184,7 +184,6 @@ pub struct App { context_page: ContextPage, term_event_tx_opt: Option>, term_config: TermConfig, - config_subscribed: bool, } impl App { @@ -385,7 +384,6 @@ impl Application for App { context_page: ContextPage::Settings, term_config: flags.term_config, term_event_tx_opt: None, - config_subscribed: false, }; let command = app.update_title(); @@ -407,7 +405,6 @@ impl Application for App { self.config = config; return self.update_config(); } - self.config_subscribed = true; } Message::Copy(entity_opt) => { 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) { - (false, _) => log::info!("must wait for config subscription before creating first tab"), - (true, Some(term_event_tx)) => match self.themes.get(self.config.syntax_theme()) { + Message::TabNew => match &self.term_event_tx_opt { + Some(term_event_tx) => match self.themes.get(self.config.syntax_theme()) { Some(colors) => { let entity = self .tab_model @@ -576,7 +572,7 @@ impl Application for App { //TODO: fall back to known good theme } }, - (true, None) => { + None => { log::warn!("tried to create new tab before having event channel"); } },