Merge pull request #6698 from spycrab/updater_default

ConfigManager: Enable Auto-Updater by default
dolphin-emu · Apr 26, 2018 · ddceac1 · ddceac1
2 parents 1b38939 + 7749e18
commit ddceac1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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, "");
 }