history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-06-10 19:25:47 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compile fix for Linux/libretro

Browse Source
This commit is contained in:
Connor McLaughlin
2020-08-21 00:26:14 +10:00
parent bca609a2a6
commit f852be74e8
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/game_settings.cpp
View File

@ -205,7 +205,7 @@ bool Database::Load(const char* path)
CSimpleIniA ini;
SI_Error err = ini.LoadFile(fp.get());
if (err != S_OK)
if (err != SI_OK)
{
Log_ErrorPrintf("Failed to parse game settings ini: %d", static_cast<int>(err));
return false;
@ -243,7 +243,7 @@ void Database::SetEntry(const std::string& code, const std::string& name, const
if (fp)
{
SI_Error err = ini.LoadFile(fp.get());
if (err != S_OK)
if (err != SI_OK)
Log_ErrorPrintf("Failed to parse game settings ini: %d. Contents will be lost.", static_cast<int>(err));
}
else
@ -266,7 +266,7 @@ void Database::SetEntry(const std::string& code, const std::string& name, const
std::fputs("# DuckStation Game Settings\n\n", fp.get());
SI_Error err = ini.SaveFile(fp.get());
if (err != S_OK)
if (err != SI_OK)
Log_ErrorPrintf("Failed to save game settings ini: %d", static_cast<int>(err));
}
else

4
src/duckstation-libretro/libretro_host_interface.cpp
View File

@ -101,7 +101,7 @@ bool LibretroHostInterface::Initialize()
return false;
LoadSettings();
FixIncompatibleSettings();
FixIncompatibleSettings(true);
UpdateLogging();
return true;
}
@ -632,7 +632,7 @@ void LibretroHostInterface::UpdateSettings()
{
Settings old_settings(std::move(g_settings));
LoadSettings();
FixIncompatibleSettings();
FixIncompatibleSettings(false);
if (g_settings.gpu_resolution_scale != old_settings.gpu_resolution_scale &&
g_settings.gpu_renderer != GPURenderer::Software)