blankie
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

modules/hyprland/backend: protect against crash when XDG_RUNTIME_DIR not set

This commit is contained in:
Austin Horstman 2024-06-08 23:53:19 -05:00
parent fa2e21dfd5
commit 959422f143
No known key found for this signature in database
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/hyprland/backend.cpp
View File

@ -23,15 +23,21 @@ std::filesystem::path IPC::getSocketFolder(const char* instanceSig) {
spdlog::warn("socketFolder already set, using {}", socketFolder_.c_str()); spdlog::warn("socketFolder already set, using {}", socketFolder_.c_str());
return socketFolder_; return socketFolder_;
} }
const char* xdgRuntimeDirEnv = std::getenv("XDG_RUNTIME_DIR");
std::filesystem::path xdgRuntimeDir;
// Only set path if env variable is set
if (xdgRuntimeDirEnv) {
xdgRuntimeDir = std::filesystem::path(xdgRuntimeDirEnv);
} }
std::filesystem::path xdgRuntimeDir = std::filesystem::path(getenv("XDG_RUNTIME_DIR"));
if (!xdgRuntimeDir.empty() && std::filesystem::exists(xdgRuntimeDir / "hypr")) { if (!xdgRuntimeDir.empty() && std::filesystem::exists(xdgRuntimeDir / "hypr")) {
socketFolder_ = xdgRuntimeDir / "hypr"; socketFolder_ = xdgRuntimeDir / "hypr";
} else { } else {
spdlog::warn("$XDG_RUNTIME_DIR/hypr does not exist, falling back to /tmp/hypr"); spdlog::warn("$XDG_RUNTIME_DIR/hypr does not exist, falling back to /tmp/hypr");
socketFolder_ = std::filesystem::path("/tmp") / "hypr"; socketFolder_ = std::filesystem::path("/tmp") / "hypr";
} }
socketFolder_ = socketFolder_ / instanceSig; socketFolder_ = socketFolder_ / instanceSig;
return socketFolder_; return socketFolder_;
} }