1
0
Fork 0
mirror of https://github.com/alacritty/alacritty.git synced 2024-11-25 14:05:41 -05:00

Remove Windows working directory canonicalization

Fixes #3198.
This commit is contained in:
David Hewitt 2020-01-15 12:47:15 +00:00 committed by Christian Duerr
parent c1664b348d
commit 7dc406252b
3 changed files with 3 additions and 6 deletions

View file

@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Font size resetting when Alacritty is moved between screens - Font size resetting when Alacritty is moved between screens
- Limited payload length in clipboard escape (used for Tmux copy/paste) - Limited payload length in clipboard escape (used for Tmux copy/paste)
- Alacritty not ignoring keyboard events for changing WM focus on X11 - Alacritty not ignoring keyboard events for changing WM focus on X11
- Regression which added a UNC path prefix to the working directory on Windows
## 0.4.1 ## 0.4.1

View file

@ -203,10 +203,7 @@ pub fn new<C>(config: &Config<C>, size: &SizeInfo, _window_id: Option<usize>) ->
} }
let cmdline = win32_string(&cmdline(&config)); let cmdline = win32_string(&cmdline(&config));
let cwd = config let cwd = config.working_directory.as_ref().map(win32_string);
.working_directory
.as_ref()
.map(|pb| win32_string(&pb.as_path().canonicalize().unwrap()));
let mut proc_info: PROCESS_INFORMATION = Default::default(); let mut proc_info: PROCESS_INFORMATION = Default::default();
unsafe { unsafe {

View file

@ -42,14 +42,13 @@ pub fn new<C>(config: &Config<C>, size: &SizeInfo, _window_id: Option<usize>) ->
let (conin, conout) = (agent.conin_name(), agent.conout_name()); let (conin, conout) = (agent.conin_name(), agent.conout_name());
let cmdline = cmdline(&config); let cmdline = cmdline(&config);
let cwd = config.working_directory.as_ref().map(|pb| pb.as_path().canonicalize().unwrap());
// Spawn process // Spawn process
let spawnconfig = SpawnConfig::new( let spawnconfig = SpawnConfig::new(
SpawnFlags::AUTO_SHUTDOWN | SpawnFlags::EXIT_AFTER_SHUTDOWN, SpawnFlags::AUTO_SHUTDOWN | SpawnFlags::EXIT_AFTER_SHUTDOWN,
None, // appname None, // appname
Some(&cmdline), Some(&cmdline),
cwd.as_ref().map(|p| p.as_ref()), config.working_directory.as_ref().map(|p| p.as_path()),
None, // Env None, // Env
) )
.unwrap(); .unwrap();