diff --git a/rpcs3/Gui/SettingsDialog.cpp b/rpcs3/Gui/SettingsDialog.cpp index a1e450b095..c78e3657f1 100644 --- a/rpcs3/Gui/SettingsDialog.cpp +++ b/rpcs3/Gui/SettingsDialog.cpp @@ -404,11 +404,11 @@ SettingsDialog::SettingsDialog(wxWindow *parent) txt_dbg_range_min->GetValue().ToLong(&minllvmid); txt_dbg_range_max->GetValue().ToLong(&maxllvmid); Ini.LLVMExclusionRange.SetValue(chbox_core_llvm_exclud->GetValue()); - Ini.LLVMMinId.SetValue(minllvmid); - Ini.LLVMMaxId.SetValue(maxllvmid); + Ini.LLVMMinId.SetValue((u32)minllvmid); + Ini.LLVMMaxId.SetValue((u32)maxllvmid); long llvmthreshold; txt_llvm_threshold->GetValue().ToLong(&llvmthreshold); - Ini.LLVMThreshold.SetValue(llvmthreshold); + Ini.LLVMThreshold.SetValue((u32)llvmthreshold); Ini.SPUDecoderMode.SetValue(rbox_spu_decoder->GetSelection()); Ini.HookStFunc.SetValue(chbox_core_hook_stfunc->GetValue()); Ini.LoadLibLv2.SetValue(chbox_core_load_liblv2->GetValue()); diff --git a/rpcs3/Ini.cpp b/rpcs3/Ini.cpp index 81848f6103..9aa2491e0d 100644 --- a/rpcs3/Ini.cpp +++ b/rpcs3/Ini.cpp @@ -121,6 +121,12 @@ void Ini::Save(const std::string& section, const std::string& key, int value) saveIniFile(); } +void Ini::Save(const std::string& section, const std::string& key, unsigned int value) +{ + static_cast(m_config)->SetLongValue(section.c_str(), key.c_str(), value); + saveIniFile(); +} + void Ini::Save(const std::string& section, const std::string& key, bool value) { static_cast(m_config)->SetBoolValue(section.c_str(), key.c_str(), value); @@ -150,6 +156,11 @@ int Ini::Load(const std::string& section, const std::string& key, const int def_ return static_cast(m_config)->GetLongValue(section.c_str(), key.c_str(), def_value); } +unsigned int Ini::Load(const std::string& section, const std::string& key, const unsigned int def_value) +{ + return static_cast(m_config)->GetLongValue(section.c_str(), key.c_str(), def_value); +} + bool Ini::Load(const std::string& section, const std::string& key, const bool def_value) { return StringToBool(static_cast(m_config)->GetValue(section.c_str(), key.c_str(), BoolToString(def_value).c_str())); diff --git a/rpcs3/Ini.h b/rpcs3/Ini.h index edc8f57f99..7daad0976a 100644 --- a/rpcs3/Ini.h +++ b/rpcs3/Ini.h @@ -25,12 +25,14 @@ protected: Ini(); void Save(const std::string& section, const std::string& key, int value); + void Save(const std::string& section, const std::string& key, unsigned int value); void Save(const std::string& section, const std::string& key, bool value); void Save(const std::string& section, const std::string& key, std::pair value); void Save(const std::string& section, const std::string& key, const std::string& value); void Save(const std::string& section, const std::string& key, WindowInfo value); int Load(const std::string& section, const std::string& key, const int def_value); + unsigned int Load(const std::string& section, const std::string& key, const unsigned int def_value); bool Load(const std::string& section, const std::string& key, const bool def_value); std::pair Load(const std::string& section, const std::string& key, const std::pair def_value); std::string Load(const std::string& section, const std::string& key, const std::string& def_value); @@ -93,9 +95,9 @@ public: // Core IniEntry CPUDecoderMode; IniEntry LLVMExclusionRange; - IniEntry LLVMMinId; - IniEntry LLVMMaxId; - IniEntry LLVMThreshold; + IniEntry LLVMMinId; + IniEntry LLVMMaxId; + IniEntry LLVMThreshold; IniEntry SPUDecoderMode; IniEntry HookStFunc; IniEntry LoadLibLv2;