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

Merge pull request #6698 from spycrab/updater_default 

ConfigManager: Enable Auto-Updater by default
This commit is contained in:
Pierre Bourdon 2018-04-26 15:30:27 +02:00 committed by GitHub
parent 1b389398ad 7749e18ecc
commit ddceac16ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Common/scmrev.h.in
View File

@ -3,3 +3,4 @@
#define SCM_BRANCH_STR "${DOLPHIN_WC_BRANCH}" #define SCM_BRANCH_STR "${DOLPHIN_WC_BRANCH}"
#define SCM_IS_MASTER ${DOLPHIN_WC_IS_STABLE} #define SCM_IS_MASTER ${DOLPHIN_WC_IS_STABLE}
#define SCM_DISTRIBUTOR_STR "${DISTRIBUTOR}" #define SCM_DISTRIBUTOR_STR "${DISTRIBUTOR}"
#define SCM_UPDATE_TRACK_STR ""

5
Source/Core/Core/ConfigManager.cpp
View File

@ -374,7 +374,7 @@ void SConfig::SaveAutoUpdateSettings(IniFile& ini)
{ {
IniFile::Section* section = ini.GetOrCreateSection("AutoUpdate"); IniFile::Section* section = ini.GetOrCreateSection("AutoUpdate");
section->Set("TrackForTesting", m_auto_update_track); section->Set("Track", m_auto_update_track);
section->Set("HashOverride", m_auto_update_hash_override); section->Set("HashOverride", m_auto_update_hash_override);
} }
@ -682,8 +682,7 @@ void SConfig::LoadAutoUpdateSettings(IniFile& ini)
{ {
IniFile::Section* section = ini.GetOrCreateSection("AutoUpdate"); IniFile::Section* section = ini.GetOrCreateSection("AutoUpdate");
// TODO: Rename and default to SCM_UPDATE_TRACK_STR when ready for general consumption. section->Get("Track", &m_auto_update_track, SCM_UPDATE_TRACK_STR);
section->Get("TrackForTesting", &m_auto_update_track, "");
section->Get("HashOverride", &m_auto_update_hash_override, ""); section->Get("HashOverride", &m_auto_update_hash_override, "");
} }