diff --git a/Utilities/Config.cpp b/Utilities/Config.cpp index 34137efa2b..46ca62e425 100644 --- a/Utilities/Config.cpp +++ b/Utilities/Config.cpp @@ -289,7 +289,7 @@ void cfg::decode(const YAML::Node& data, cfg::_base& rhs, bool dynamic) if (YAML::convert::decode(data, value)) { - rhs.from_string(value); + rhs.from_string(value, dynamic); } break; // ??? diff --git a/Utilities/Config.h b/Utilities/Config.h index 6bf8a5070f..2bd3572ea1 100644 --- a/Utilities/Config.h +++ b/Utilities/Config.h @@ -50,7 +50,7 @@ namespace cfg _base(type _type); // Owned entry constructor - _base(type _type, class node* owner, const std::string& name, bool dynamic = true); + _base(type _type, class node* owner, const std::string& name, bool dynamic); public: _base(const _base&) = delete; @@ -359,15 +359,15 @@ namespace cfg } }; - // Simple set entry with mutex (TODO: template for various types) + // Simple set entry (TODO: template for various types) class set_entry final : public _base { std::set m_set; public: // Default value is empty list in current implementation - set_entry(node* owner, const std::string& name, bool dynamic = false) - : _base(type::set, owner, name, dynamic) + set_entry(node* owner, const std::string& name) + : _base(type::set, owner, name, false) { } @@ -402,7 +402,7 @@ namespace cfg public: log_entry(node* owner, const std::string& name) - : _base(type::log, owner, name) + : _base(type::log, owner, name, true) { } diff --git a/rpcs3/rpcs3qt/emu_settings.cpp b/rpcs3/rpcs3qt/emu_settings.cpp index 3c7afcf03d..23398a5cc1 100644 --- a/rpcs3/rpcs3qt/emu_settings.cpp +++ b/rpcs3/rpcs3qt/emu_settings.cpp @@ -321,7 +321,7 @@ void emu_settings::SaveSettings() if (config_name == g_cfg.name || m_title_id == Emu.GetTitleID()) { // Update current config - g_cfg.from_string(config.to_string(), true); + g_cfg.from_string(config.to_string(), !Emu.IsStopped()); if (!Emu.IsStopped()) // Don't spam the log while emulation is stopped. The config will be logged on boot anyway. {