diff options
Diffstat (limited to 'alacritty/src/main.rs')
| -rw-r--r-- | alacritty/src/main.rs | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/alacritty/src/main.rs b/alacritty/src/main.rs index e6884204..21c4804c 100644 --- a/alacritty/src/main.rs +++ b/alacritty/src/main.rs @@ -54,7 +54,7 @@ mod gl { } use crate::cli::Options; -use crate::config::monitor::Monitor; +use crate::config::monitor; use crate::config::Config; use crate::display::Display; use crate::event::{Event, EventProxy, Processor}; @@ -84,7 +84,10 @@ fn main() { // Load configuration file. let config_path = options.config_path().or_else(config::installed_config); - let config = config_path.map(config::load_from).unwrap_or_else(Config::default); + let config = config_path + .as_ref() + .and_then(|path| config::load_from(path).ok()) + .unwrap_or_else(Config::default); let config = options.into_config(config); // Update the log level from config. @@ -121,9 +124,9 @@ fn main() { fn run(window_event_loop: GlutinEventLoop<Event>, config: Config) -> Result<(), Box<dyn Error>> { info!("Welcome to Alacritty"); - match &config.config_path { - Some(config_path) => info!("Configuration loaded from \"{}\"", config_path.display()), - None => info!("No configuration file found"), + info!("Configuration files loaded from:"); + for path in &config.ui_config.config_paths { + info!(" \"{}\"", path.display()); } // Set environment variables. @@ -179,7 +182,7 @@ fn run(window_event_loop: GlutinEventLoop<Event>, config: Config) -> Result<(), // The monitor watches the config file for changes and reloads it. Pending // config changes are processed in the main loop. if config.ui_config.live_config_reload() { - config.config_path.as_ref().map(|path| Monitor::new(path, event_proxy.clone())); + monitor::watch(config.ui_config.config_paths.clone(), event_proxy); } // Setup storage for message UI. |