From 2cbd5cb3e64c667c6d85aa071d4d74ec02fb77ba Mon Sep 17 00:00:00 2001 From: LC Date: Mon, 27 Jul 2026 13:51:50 -0400 Subject: [PATCH] Config: Amend prototypes where applicable Previously, these didn't match up with the implementation (luckily it's only used internally at the moment). --- Source/Common/Config.cpp | 2 +- Source/Common/Config.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Common/Config.cpp b/Source/Common/Config.cpp index 741936449..9062990b6 100644 --- a/Source/Common/Config.cpp +++ b/Source/Common/Config.cpp @@ -356,7 +356,7 @@ fextl::unique_ptr CreateMainLayer(const fextl::string* F } fextl::unique_ptr CreateUserOverrideLayer(std::string_view AppConfig, std::optional AppName) { - return fextl::make_unique(FEXCore::Config::LayerType::LAYER_USER_OVERRIDE, AppConfig, AppName); + return fextl::make_unique(FEXCore::Config::LayerType::LAYER_USER_OVERRIDE, AppConfig, std::move(AppName)); } fextl::unique_ptr CreateAppLayer(const fextl::string& Filename, FEXCore::Config::LayerType Type) { diff --git a/Source/Common/Config.h b/Source/Common/Config.h index f0ee1f35e..6834ca8f9 100644 --- a/Source/Common/Config.h +++ b/Source/Common/Config.h @@ -59,7 +59,7 @@ void LoadConfig(fextl::string ProgramName = {}, char** const envp = nullptr, con fextl::string GetHomeDirectory(); -fextl::string GetDataDirectory(const PortableInformation& PortableInfo); +fextl::string GetDataDirectory(bool Global, const PortableInformation& PortableInfo); fextl::string GetConfigDirectory(bool Global, const PortableInformation& PortableInfo); fextl::string GetConfigFileLocation(bool Global, const PortableInformation& PortableInfo); fextl::string GetCacheDirectory(); @@ -82,7 +82,7 @@ fextl::unique_ptr CreateGlobalMainLayer(); * @return unique_ptr for that layer */ fextl::unique_ptr CreateMainLayer(const fextl::string* File = nullptr, std::optional AppName = std::nullopt); -fextl::unique_ptr CreateUserOverrideLayer(std::string_view AppConfig); +fextl::unique_ptr CreateUserOverrideLayer(std::string_view AppConfig, std::optional AppName); /** * @brief Create an application configuration loader