Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-01-18 14:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

INISettingsInterface: Fix saving/loading with Unicode paths

Browse source
This commit is contained in:
Connor McLaughlin 2020-08-09 04:40:15 +10:00
parent 5b9db71b87
commit ac42510780
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,11 +1,19 @@
#include "ini_settings_interface.h"
#include "common/file_system.h"
#include "common/log.h"
#include <algorithm>
Log_SetChannel(INISettingsInterface);
INISettingsInterface::INISettingsInterface(std::string filename) : m_filename(std::move(filename)), m_ini(true, true)
{
SI_Error err = m_ini.LoadFile(m_filename.c_str());
SI_Error err = SI_FAIL;
std::FILE* fp = FileSystem::OpenCFile(m_filename.c_str(), "rb");
if (fp)
{
err = m_ini.LoadFile(fp);
std::fclose(fp);
}
if (err != SI_OK)
Log_WarningPrintf("Settings could not be loaded from '%s', defaults will be used.", m_filename.c_str());
}
@ -18,7 +26,14 @@ INISettingsInterface::~INISettingsInterface()
bool INISettingsInterface::Save()
{
SI_Error err = m_ini.SaveFile(m_filename.c_str(), false);
SI_Error err = SI_FAIL;
std::FILE* fp = FileSystem::OpenCFile(m_filename.c_str(), "wb");
if (fp)
{
err = m_ini.SaveFile(fp, false);
std::fclose(fp);
}
if (err != SI_OK)
{
Log_WarningPrintf("Failed to save settings to '%s'.", m_filename.c_str());

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

@ -1,6 +1,10 @@
#pragma once
#include "core/settings.h"
// being a pain here...
#ifdef WIN32
#include "common/windows_headers.h"
#endif
#include "SimpleIni.h"
class INISettingsInterface : public SettingsInterface