diff --git a/src/common/config.cpp b/src/common/config.cpp index 3d86751df..ecd673136 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -486,7 +486,7 @@ void setSaveDataPath(const std::filesystem::path& path) { save_data_path = path; } -std::vector getGameDirectories() { +const std::vector getGameDirectories() { std::vector enabled_dirs; for (const auto& dir : settings_directories) { if (dir.enabled) { @@ -496,12 +496,12 @@ std::vector getGameDirectories() { return enabled_dirs; } -std::vector getGameDirectoriesEnabled() { - std::vector enabled; +const std::vector getGameDirectoriesEnabled() { + std::vector enabled_dirs; for (const auto& dir : settings_directories) { - enabled.push_back(dir.enabled); + enabled_dirs.push_back(dir.enabled); } - return enabled; + return enabled_dirs; } std::filesystem::path getAddonDirectory() { diff --git a/src/common/config.h b/src/common/config.h index a23c7c943..218c65433 100644 --- a/src/common/config.h +++ b/src/common/config.h @@ -121,8 +121,8 @@ void removeGameDirectories(const std::filesystem::path& dir); void setGameDirectoriesEnabled(const std::filesystem::path& dir, bool enabled); void setAddonDirectories(const std::filesystem::path& dir); -std::vector getGameDirectories(); -std::vector getGameDirectoriesEnabled(); +const std::vector getGameDirectories(); +const std::vector getGameDirectoriesEnabled(); std::filesystem::path getAddonDirectory(); void setDefaultValues(); diff --git a/src/qt_gui/game_info.cpp b/src/qt_gui/game_info.cpp index 6e1f82d50..13147df5a 100644 --- a/src/qt_gui/game_info.cpp +++ b/src/qt_gui/game_info.cpp @@ -39,10 +39,10 @@ GameInfoClass::~GameInfoClass() = default; void GameInfoClass::GetGameInfo(QWidget* parent) { QStringList filePaths; - for (const auto& installLoc : Config::getGameDirectories()) { - QString Directories; - Common::FS::PathToQString(Directories, installLoc); - ScanDirectoryRecursively(Directories, filePaths, 0); + for (const auto& directoriesLoc : Config::getGameDirectories()) { + QString directories; + Common::FS::PathToQString(directories, directoriesLoc); + ScanDirectoryRecursively(directories, filePaths, 0); } m_games = QtConcurrent::mapped(filePaths, [&](const QString& path) { diff --git a/src/qt_gui/settings_dialog.cpp b/src/qt_gui/settings_dialog.cpp index b2cbd2088..590c6a52d 100644 --- a/src/qt_gui/settings_dialog.cpp +++ b/src/qt_gui/settings_dialog.cpp @@ -826,7 +826,7 @@ void SettingsDialog::ResetInstallFolders() { if (data.contains("GUI")) { const toml::value& gui = data.at("GUI"); const auto directories_array = - toml::find_or>(gui, "directories", {}); + toml::find_or>(gui, "installDirs", {}); std::vector directories_enabled; try {