Fixed loading configuration from $HOME/.config/

houmain · Jun 16, 2022 · 542b36d · 542b36d
1 parent 40c20ca
commit 542b36d
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/client/linux/main.cpp b/src/client/linux/main.cpp
@@ -12,7 +12,7 @@
 #include <pwd.h>
 
 namespace {
-  const auto system_config_path = "/etc/";
+  const auto system_config_path = std::filesystem::path("/etc/");
   const auto update_interval = std::chrono::milliseconds(50);
 
   Settings g_settings;
@@ -120,7 +120,7 @@ namespace {
     }
   }
 
-  const char* get_home_path() {
+  std::filesystem::path get_home_path() {
     if (auto homedir = ::getenv("HOME"))
       return homedir;
     return ::getpwuid(::getuid())->pw_dir;
@@ -131,8 +131,8 @@ namespace {
     auto error = std::error_code{ };
     if (filename.empty()) {
       filename = default_config_filename;
-      for (auto base : {
-          get_home_path(),
+      for (const auto& base : {
+          get_home_path() / ".config",
           system_config_path
         }) {
         auto path = base / filename;