Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-10-23 07:35:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

INISettingsInterface: Make constructor parameter a std::string

Browse source
This commit is contained in:
Connor McLaughlin 2020-04-05 22:57:29 +10:00
parent 45d7294c3c
commit 70ccdcfc30
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/duckstation-sdl/sdl_host_interface.cpp
View file

@ -265,7 +265,7 @@ void SDLHostInterface::RunLater(std::function<void()> callback)
void SDLHostInterface::SaveSettings() void SDLHostInterface::SaveSettings()
{ {
INISettingsInterface si(GetSettingsFileName().c_str()); INISettingsInterface si(GetSettingsFileName());
m_settings_copy.Save(si); m_settings_copy.Save(si);
} }
@ -295,7 +295,7 @@ std::unique_ptr<SDLHostInterface> SDLHostInterface::Create()
std::unique_ptr<SDLHostInterface> intf = std::make_unique<SDLHostInterface>(); std::unique_ptr<SDLHostInterface> intf = std::make_unique<SDLHostInterface>();
// Settings need to be loaded prior to creating the window for OpenGL bits. // Settings need to be loaded prior to creating the window for OpenGL bits.
INISettingsInterface si(intf->GetSettingsFileName().c_str()); INISettingsInterface si(intf->GetSettingsFileName());
intf->m_settings_copy.Load(si); intf->m_settings_copy.Load(si);
intf->m_settings = intf->m_settings_copy; intf->m_settings = intf->m_settings_copy;
intf->m_fullscreen = intf->m_settings_copy.start_fullscreen; intf->m_fullscreen = intf->m_settings_copy.start_fullscreen;

6
src/frontend-common/ini_settings_interface.cpp
View file

@ -3,11 +3,11 @@
#include <algorithm> #include <algorithm>
Log_SetChannel(INISettingsInterface); Log_SetChannel(INISettingsInterface);
INISettingsInterface::INISettingsInterface(const char* filename) : m_filename(filename), m_ini(true, true) INISettingsInterface::INISettingsInterface(std::string filename) : m_filename(std::move(filename)), m_ini(true, true)
{ {
SI_Error err = m_ini.LoadFile(filename); SI_Error err = m_ini.LoadFile(m_filename.c_str());
if (err != SI_OK) if (err != SI_OK)
Log_WarningPrintf("Settings could not be loaded from '%s', defaults will be used.", filename); Log_WarningPrintf("Settings could not be loaded from '%s', defaults will be used.", m_filename.c_str());
} }
INISettingsInterface::~INISettingsInterface() INISettingsInterface::~INISettingsInterface()

2
src/frontend-common/ini_settings_interface.h
View file

@ -6,7 +6,7 @@
class INISettingsInterface : public SettingsInterface class INISettingsInterface : public SettingsInterface
{ {
public: public:
INISettingsInterface(const char* filename); INISettingsInterface(std::string filename);
~INISettingsInterface(); ~INISettingsInterface();
void Clear() override; void Clear() override;