hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-12-23 08:49:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

config: minor path handling fixes

Browse source
This commit is contained in:
vaxerski 2023-07-10 13:10:30 +02:00
parent 4cc0e6de90
commit 42f46aeac5
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/config/ConfigManager.cpp
View file

@ -1516,6 +1516,7 @@ void CConfigManager::loadConfigLoadVars() {
while (std::getline(ifs, line)) { while (std::getline(ifs, line)) {
// Read line by line. // Read line by line.
try { try {
configCurrentPath = mainConfigPath;
parseLine(line); parseLine(line);
} catch (...) { } catch (...) {
Debug::log(ERR, "Error reading line from config. Line:"); Debug::log(ERR, "Error reading line from config. Line:");

4
src/helpers/MiscFunctions.cpp
View file

@ -130,9 +130,9 @@ std::string absolutePath(const std::string& rawpath, const std::string& currentP
if (value[1] == '.') { if (value[1] == '.') {
auto parentDir = currentDir.substr(0, currentDir.find_last_of('/')); auto parentDir = currentDir.substr(0, currentDir.find_last_of('/'));
value.replace(0, 2, parentDir); value.replace(0, 2 + currentPath.empty(), parentDir);
} else { } else {
value.replace(0, 1, currentDir); value.replace(0, 1 + currentPath.empty(), currentDir);
} }
} }