Fix crash with invalid working directory

3 files changed, 5 insertions, 5 deletions

diff --git a/alacritty_terminal/src/tty/unix.rs b/alacritty_terminal/src/tty/unix.rs
index ab34d33a..1b01af0f 100644
--- a/alacritty_terminal/src/tty/unix.rs
+++ b/alacritty_terminal/src/tty/unix.rs
@@ -208,7 +208,7 @@ pub fn new<C>(config: &Config<C>, size: &SizeInfo, window_id: Option<usize>) ->
     }
 
     // Handle set working directory option
-    if let Some(ref dir) = config.working_directory() {
+    if let Some(dir) = &config.working_directory {
         builder.current_dir(dir);
     }
 
diff --git a/alacritty_terminal/src/tty/windows/conpty.rs b/alacritty_terminal/src/tty/windows/conpty.rs
index 28cdf4c4..0bed412b 100644
--- a/alacritty_terminal/src/tty/windows/conpty.rs
+++ b/alacritty_terminal/src/tty/windows/conpty.rs
@@ -204,9 +204,9 @@ pub fn new<C>(config: &Config<C>, size: &SizeInfo, _window_id: Option<usize>) ->
 
     let cmdline = win32_string(&cmdline(&config));
     let cwd = config
-        .working_directory()
-        .map(|dir| dir.canonicalize().unwrap())
-        .map(|path| win32_string(&path));
+        .working_directory
+        .as_ref()
+        .map(|pb| win32_string(&pb.as_path().canonicalize().unwrap()));
 
     let mut proc_info: PROCESS_INFORMATION = Default::default();
     unsafe {
diff --git a/alacritty_terminal/src/tty/windows/winpty.rs b/alacritty_terminal/src/tty/windows/winpty.rs
index c56ad8f6..2eccecbf 100644
--- a/alacritty_terminal/src/tty/windows/winpty.rs
+++ b/alacritty_terminal/src/tty/windows/winpty.rs
@@ -42,7 +42,7 @@ pub fn new<C>(config: &Config<C>, size: &SizeInfo, _window_id: Option<usize>) ->
     let (conin, conout) = (agent.conin_name(), agent.conout_name());
 
     let cmdline = cmdline(&config);
-    let cwd = config.working_directory().map(|dir| dir.canonicalize().unwrap());
+    let cwd = config.working_directory.as_ref().map(|pb| pb.as_path().canonicalize().unwrap());
 
     // Spawn process
     let spawnconfig = SpawnConfig::new(