From 47166db166fc2b5141d53fefe62ad07a5cad33a0 Mon Sep 17 00:00:00 2001 From: iTrooz_ Date: Wed, 3 Aug 2022 19:52:02 +0200 Subject: [PATCH] fix: Invalid paths being added to the default paths on Linux (#644) * do not iterate over XDG home dir * fixed typo * use push_back * same fix for getConfigPaths --- lib/libimhex/source/helpers/fs.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/libimhex/source/helpers/fs.cpp b/lib/libimhex/source/helpers/fs.cpp index d5b602c71..ab6b4df1c 100644 --- a/lib/libimhex/source/helpers/fs.cpp +++ b/lib/libimhex/source/helpers/fs.cpp @@ -130,11 +130,10 @@ namespace hex::fs { #elif defined(OS_LINUX) - auto dataDirs = xdg::DataDirs(); - auto dataDirsHome = xdg::DataHomeDir(); + paths.push_back(xdg::DataHomeDir()); + auto dataDirs = xdg::DataDirs(); std::copy(dataDirs.begin(), dataDirs.end(), std::back_inserter(paths)); - std::copy(dataDirsHome.begin(), dataDirsHome.end(), std::back_inserter(paths)); #endif @@ -159,11 +158,10 @@ namespace hex::fs { #elif defined(OS_LINUX) std::vector paths; - auto configDirs = xdg::ConfigDirs(); - auto configDirsHome = xdg::ConfigHomeDir(); + paths.push_back(xdg::DataHomeDir()); - std::copy(configDirs.begin(), configDirs.end(), std::back_inserter(paths)); - std::copy(configDirsHome.begin(), configDirsHome.end(), std::back_inserter(paths)); + auto dataDirs = xdg::DataDirs(); + std::copy(dataDirs.begin(), dataDirs.end(), std::back_inserter(paths)); return paths; #endif