ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Video] Ignore changes when writing settings

This commit is contained in:
zilmar 2017-06-06 04:26:54 +10:00
parent de497775b5
commit a9683b36fb
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Project64-video/Settings.cpp
View File

@ -93,7 +93,8 @@ CSettings::CSettings() :
m_wrpVRAM(0), m_wrpVRAM(0),
m_wrpFBO(false), m_wrpFBO(false),
m_wrpAnisotropic(false), m_wrpAnisotropic(false),
m_FlushLogs(false) m_FlushLogs(false),
m_InWriteSettings(false)
{ {
memset(m_log_dir, 0, sizeof(m_log_dir)); memset(m_log_dir, 0, sizeof(m_log_dir));
RegisterSettings(); RegisterSettings();
@ -568,7 +569,7 @@ void CSettings::ReadSettings()
m_debugger_enabled = m_advanced_options && m_Set_debugger ? GetSystemSetting(m_Set_debugger) == 1 : false; m_debugger_enabled = m_advanced_options && m_Set_debugger ? GetSystemSetting(m_Set_debugger) == 1 : false;
m_texenh_options = GetSetting(Set_texenh_options) != 0; m_texenh_options = GetSetting(Set_texenh_options) != 0;
m_aspectmode = (AspectMode_t)GetSetting(Set_aspect); m_aspectmode = (AspectMode_t)GetSetting(Set_aspect);
m_wrpVRAM = GetSetting(Set_wrpVRAM); m_wrpVRAM = GetSetting(Set_wrpVRAM);
m_wrpFBO = GetSetting(Set_wrpFBO) != 0; m_wrpFBO = GetSetting(Set_wrpFBO) != 0;
m_wrpAnisotropic = GetSetting(Set_wrpAnisotropic) != 0; m_wrpAnisotropic = GetSetting(Set_wrpAnisotropic) != 0;
@ -831,6 +832,7 @@ void CSettings::ReadGameSettings(const char * name)
void CSettings::WriteSettings(void) void CSettings::WriteSettings(void)
{ {
m_InWriteSettings = true;
SetSetting(Set_Resolution, m_ScreenRes); SetSetting(Set_Resolution, m_ScreenRes);
#ifndef ANDROID #ifndef ANDROID
SetSetting(Set_FullScreenRes, m_FullScreenRes); SetSetting(Set_FullScreenRes, m_FullScreenRes);
@ -893,6 +895,7 @@ void CSettings::WriteSettings(void)
} }
FlushSettings(); FlushSettings();
m_InWriteSettings = false;
} }
void CSettings::general_setting(short setting_ID, const char * name, unsigned int value) void CSettings::general_setting(short setting_ID, const char * name, unsigned int value)
@ -912,6 +915,10 @@ void CSettings::game_setting_default(short setting_ID, const char * name, short
void CSettings::SettingsChanged(void) void CSettings::SettingsChanged(void)
{ {
if (m_InWriteSettings)
{
return;
}
m_ScreenRes = GetSetting(Set_Resolution); m_ScreenRes = GetSetting(Set_Resolution);
m_aspectmode = (AspectMode_t)GetSetting(Set_aspect); m_aspectmode = (AspectMode_t)GetSetting(Set_aspect);
} }

1
Source/Project64-video/Settings.h
View File

@ -406,6 +406,7 @@ private:
bool m_old_style_adither; bool m_old_style_adither;
bool m_n64_z_scale; bool m_n64_z_scale;
hacks_t m_hacks; hacks_t m_hacks;
bool m_InWriteSettings;
}; };
extern CSettings * g_settings; extern CSettings * g_settings;