From 942791c7637d3b4da5c0c35a854e44d7cc7a38c3 Mon Sep 17 00:00:00 2001 From: georgemoralis Date: Fri, 27 Dec 2024 23:21:43 +0200 Subject: [PATCH] merge fixes --- src/common/config.cpp | 4 ++-- src/common/config.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/config.cpp b/src/common/config.cpp index 97f71c82b..8f90a1fde 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -676,7 +676,7 @@ void load(const std::filesystem::path& path) { m_language = toml::find_or(settings, "consoleLanguage", 1); } - + if (data.contains("Keys")) { const toml::value& keys = data.at("keys"); trophyKey = toml::find_or(keys, "TrophyKey", ""); @@ -741,7 +741,7 @@ void save(const std::filesystem::path& path) { data["Audio"]["backend"] = audioBackend; data["Debug"]["DebugDump"] = isDebugDump; data["Debug"]["CollectShader"] = isShaderDebug; - + data["Keys"]["TrophyKey"] = trophyKey; std::vector install_dirs; diff --git a/src/common/config.h b/src/common/config.h index 937efafab..a7be2136b 100644 --- a/src/common/config.h +++ b/src/common/config.h @@ -13,6 +13,7 @@ enum HideCursorState : s16 { Never, Idle, Always }; void load(const std::filesystem::path& path); void save(const std::filesystem::path& path); +void saveMainWindow(const std::filesystem::path& path); std::string getTrophyKey(); void setTrophyKey(std::string key);