From 9bfa1114af82825febe466cb0d3d985432e4e58a Mon Sep 17 00:00:00 2001 From: Frank Li Date: Fri, 16 Apr 2010 21:05:29 +0800 Subject: [PATCH] Fixed issue #387: "Automatically check for newer versions every week" remains disabled Signed-off-by: Frank Li --- src/TortoiseProc/CheckForUpdatesDlg.cpp | 9 ++++++++- src/TortoiseProc/Settings/SetMainPage.cpp | 6 ++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/TortoiseProc/CheckForUpdatesDlg.cpp b/src/TortoiseProc/CheckForUpdatesDlg.cpp index 7a9488f38..77eb5317a 100644 --- a/src/TortoiseProc/CheckForUpdatesDlg.cpp +++ b/src/TortoiseProc/CheckForUpdatesDlg.cpp @@ -140,7 +140,14 @@ UINT CCheckForUpdatesDlg::CheckThread() x4=_ttoi(ver)&0xFFFF; unsigned __int64 newversion; - newversion = (x1<<48) + (x2<<32) + (x3<<16)+x4; + newversion = x1; + newversion <<= 16; + newversion += x2; + newversion <<= 16; + newversion += x3; + newversion <<=16; + newversion += build; + if(newversion>version) { major=x1; diff --git a/src/TortoiseProc/Settings/SetMainPage.cpp b/src/TortoiseProc/Settings/SetMainPage.cpp index 96f4a43f3..36c6f44c8 100644 --- a/src/TortoiseProc/Settings/SetMainPage.cpp +++ b/src/TortoiseProc/Settings/SetMainPage.cpp @@ -62,7 +62,7 @@ void CSetMainPage::DoDataExchange(CDataExchange* pDX) DDX_Control(pDX, IDC_LANGUAGECOMBO, m_LanguageCombo); m_dwLanguage = (DWORD)m_LanguageCombo.GetItemData(m_LanguageCombo.GetCurSel()); DDX_Text(pDX, IDC_MSYSGIT_PATH, m_sMsysGitPath); -// DDX_Check(pDX, IDC_CHECKNEWERVERSION, m_bCheckNewer); + DDX_Check(pDX, IDC_CHECKNEWERVERSION, m_bCheckNewer); // DDX_Check(pDX, IDC_COMMITFILETIMES, m_bLastCommitTime); // DDX_Check(pDX, IDC_ASPDOTNETHACK, m_bUseDotNetHack); } @@ -87,8 +87,6 @@ BOOL CSetMainPage::OnInitDialog() ISettingsPropPage::OnInitDialog(); // disable features that have not yet been implemented - GetDlgItem(IDC_CHECKNEWERVERSION)->EnableWindow( FALSE ); - GetDlgItem(IDC_CHECKNEWERBUTTON)->EnableWindow( FALSE ); GetDlgItem(IDC_SOUNDS)->EnableWindow( FALSE ); GetDlgItem(IDC_SOUNDS_TEXT)->EnableWindow( FALSE ); @@ -104,7 +102,7 @@ BOOL CSetMainPage::OnInitDialog() m_tooltips.Create(this); m_tooltips.AddTool(IDC_MSYSGIT_PATH,IDS_MSYSGIT_PATH_TT); - //m_tooltips.AddTool(IDC_CHECKNEWERVERSION, IDS_SETTINGS_CHECKNEWER_TT); + m_tooltips.AddTool(IDC_CHECKNEWERVERSION, IDS_SETTINGS_CHECKNEWER_TT); //m_tooltips.AddTool(IDC_COMMITFILETIMES, IDS_SETTINGS_COMMITFILETIMES_TT); //m_tooltips.AddTool(IDC_ASPDOTNETHACK, IDS_SETTINGS_DOTNETHACK_TT); -- 2.11.4.GIT