summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorspycrab <spycrab@users.noreply.github.com>2018-04-26 14:42:00 +0200
committerspycrab <spycrab@users.noreply.github.com>2018-04-26 15:12:15 +0200
commit7749e18ecc208f045604a2fdfba728583254b3a2 (patch)
tree716fd631bdf6da3298bbefc78c27543440e8ee72 /Source/Core
parent1b389398adedf5de611d402d46aeed089b2014c1 (diff)
ConfigManager: Enable Auto-Updater by default
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Common/scmrev.h.in1
-rw-r--r--Source/Core/Core/ConfigManager.cpp5
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/Common/scmrev.h.in b/Source/Core/Common/scmrev.h.in
index 6be4c461bb..df99e55f05 100644
--- a/Source/Core/Common/scmrev.h.in
+++ b/Source/Core/Common/scmrev.h.in
@@ -3,3 +3,4 @@
#define SCM_BRANCH_STR "${DOLPHIN_WC_BRANCH}"
#define SCM_IS_MASTER ${DOLPHIN_WC_IS_STABLE}
#define SCM_DISTRIBUTOR_STR "${DISTRIBUTOR}"
+#define SCM_UPDATE_TRACK_STR ""
diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp
index 252c443163..387c9a8e17 100644
--- a/Source/Core/Core/ConfigManager.cpp
+++ b/Source/Core/Core/ConfigManager.cpp
@@ -374,7 +374,7 @@ void SConfig::SaveAutoUpdateSettings(IniFile& ini)
{
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);
}
@@ -682,8 +682,7 @@ void SConfig::LoadAutoUpdateSettings(IniFile& ini)
{
IniFile::Section* section = ini.GetOrCreateSection("AutoUpdate");
- // TODO: Rename and default to SCM_UPDATE_TRACK_STR when ready for general consumption.
- section->Get("TrackForTesting", &m_auto_update_track, "");
+ section->Get("Track", &m_auto_update_track, SCM_UPDATE_TRACK_STR);
section->Get("HashOverride", &m_auto_update_hash_override, "");
}