diff options
author | rabite <rabite@posteo.de> | 2019-06-19 19:17:25 +0200 |
---|---|---|
committer | rabite <rabite@posteo.de> | 2019-06-19 19:30:11 +0200 |
commit | fc32c58c9d2128b1337d9604dc5a542f618c9c3e (patch) | |
tree | 7ca8a31481e323e19204dd16d5adb258518054e4 /src/widget.rs | |
parent | 89260e4312e79ac2e0623c6e7f18ee9a55e5bb08 (diff) |
added auto-installer for configs
Diffstat (limited to 'src/widget.rs')
-rw-r--r-- | src/widget.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/widget.rs b/src/widget.rs index 43c1fdf..6cb19eb 100644 --- a/src/widget.rs +++ b/src/widget.rs @@ -75,10 +75,10 @@ impl WidgetCore { let (sender, receiver) = channel(); let status_bar_content = Arc::new(Mutex::new(None)); - let mut config = Async::new(|_| Ok(Config::load()?)); - let confsender = Arc::new(Mutex::new(sender.clone())); + let mut config = Async::new(move |_| Ok(Config::load()?)); + let confsender = sender.clone(); config.on_ready(move |_, _| { - confsender.lock().map(|s| s.send(Events::ConfigLoaded)).ok(); + confsender.send(Events::ConfigLoaded).ok(); Ok(()) }).log(); config.run().log(); @@ -123,7 +123,7 @@ impl WidgetCore { } pub fn show_status(&self, status: &str) -> HResult<()> { - HError::log::<()>(status.to_string()).log(); + HError::log::<()>(status).ok(); { let mut status_content = self.status_bar_content.lock()?; *status_content = Some(status.to_string()); @@ -466,7 +466,7 @@ pub trait Widget { self.get_core()?.screen()?.clear().log(); } Events::ConfigLoaded => { - self.get_core_mut()?.config.write()?.pull_async()?; + self.get_core_mut()?.config.write()?.pull_async().ok(); self.config_loaded().log(); } _ => {} |