From 631ca785e7d247ec0a604fb3030aab4ed776fbb6 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 22 Jan 2012 17:46:07 +0100 Subject: [PATCH] renamed CheckNewer registry setting to VersionCheck Signed-off-by: Sven Strickroth --- src/TortoiseProc/Settings/SettingsAdvanced.cpp | 8 ++++---- src/TortoiseProc/TortoiseProc.cpp | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/TortoiseProc/Settings/SettingsAdvanced.cpp b/src/TortoiseProc/Settings/SettingsAdvanced.cpp index 2f227eac2..c7b921dc4 100644 --- a/src/TortoiseProc/Settings/SettingsAdvanced.cpp +++ b/src/TortoiseProc/Settings/SettingsAdvanced.cpp @@ -42,10 +42,6 @@ CSettingsAdvanced::CSettingsAdvanced() settings[i].type = CSettingsAdvanced::SettingTypeBoolean; settings[i++].def.b = false; - settings[i].sName = L"CheckNewer"; - settings[i].type = CSettingsAdvanced::SettingTypeBoolean; - settings[i++].def.b = true; - settings[i].sName = L"ColumnsEveryWhere"; settings[i].type = CSettingsAdvanced::SettingTypeBoolean; settings[i++].def.b = false; @@ -66,6 +62,10 @@ CSettingsAdvanced::CSettingsAdvanced() settings[i].type = CSettingsAdvanced::SettingTypeBoolean; settings[i++].def.b = true; + settings[i].sName = L"VersionCheck"; + settings[i].type = CSettingsAdvanced::SettingTypeBoolean; + settings[i++].def.b = true; + settings[i].sName = L""; settings[i].type = CSettingsAdvanced::SettingTypeNone; settings[i++].def.b = false; diff --git a/src/TortoiseProc/TortoiseProc.cpp b/src/TortoiseProc/TortoiseProc.cpp index 3e160c986..2b55a24c7 100644 --- a/src/TortoiseProc/TortoiseProc.cpp +++ b/src/TortoiseProc/TortoiseProc.cpp @@ -529,6 +529,9 @@ void CTortoiseProcApp::CheckUpgrade() CoUninitialize(); CRegStdDWORD(_T("Software\\TortoiseGit\\ConvertBase")).removeValue(); CRegStdDWORD(_T("Software\\TortoiseGit\\DiffProps")).removeValue(); + if (CRegStdDWORD(_T("Software\\TortoiseGit\\CheckNewer"), TRUE) == FALSE) + CRegStdDWORD(_T("Software\\TortoiseGit\\VersionCheck")) = FALSE; + CRegStdDWORD(_T("Software\\TortoiseGit\\CheckNewer")).removeValue(); } #if 0 if (lVersion <= 0x01010300) @@ -698,7 +701,7 @@ int CTortoiseProcApp::ExitInstance() void CTortoiseProcApp::CheckForNewerVersion() { // check for newer versions - if (CRegDWORD(_T("Software\\TortoiseGit\\CheckNewer"), TRUE) != FALSE) + if (CRegDWORD(_T("Software\\TortoiseGit\\VersionCheck"), TRUE) != FALSE) { time_t now; struct tm ptm; -- 2.11.4.GIT