1
0
Fork 0
mirror of https://github.com/alacritty/alacritty.git synced 2024-11-11 13:51:01 -05:00

Account for absolute WAYLAND_DISPLAY paths

If WAYLAND_DISPLAY contains a '/', we have to replace with with another
character before using WAYLAND_DISPLAY as a path component.
This commit is contained in:
mahkoh 2022-02-16 22:15:50 +01:00 committed by GitHub
parent a64553bbaf
commit aaab88c5c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

View file

@ -32,6 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Buili-in font arcs alignment - Buili-in font arcs alignment
- Repeated permission prompts on M1 macs - Repeated permission prompts on M1 macs
- Colors being slightly off when using `colors.transparent_background_colors` - Colors being slightly off when using `colors.transparent_background_colors`
- Creating the IPC socket failing if WAYLAND_DISPLAY contains an absolute path
## 0.10.0 ## 0.10.0

View file

@ -152,7 +152,7 @@ fn find_socket(socket_path: Option<PathBuf>) -> IoResult<UnixStream> {
#[cfg(not(target_os = "macos"))] #[cfg(not(target_os = "macos"))]
fn socket_prefix() -> String { fn socket_prefix() -> String {
let display = env::var("WAYLAND_DISPLAY").or_else(|_| env::var("DISPLAY")).unwrap_or_default(); let display = env::var("WAYLAND_DISPLAY").or_else(|_| env::var("DISPLAY")).unwrap_or_default();
format!("Alacritty-{}", display) format!("Alacritty-{}", display.replace('/', "-"))
} }
/// File prefix matching all available sockets. /// File prefix matching all available sockets.