From e2ef893023e09ecf0486a0fc9b8d89d17ac425bf Mon Sep 17 00:00:00 2001 From: Frank Li Date: Sat, 7 Mar 2009 22:02:51 +0800 Subject: [PATCH] Fix SwitchDlg assert fail Signed-off-by: Frank Li --- src/Changelog.txt | 8 +++++++- src/TortoiseProc/GitSwitchDlg.cpp | 4 +++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index 17d46be8c..59d6090ad 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -1,4 +1,10 @@ -Version 0.4.1.0 version(internal) +Version 0.4.2.0 version(external) + *Fix Shell menu disappear because ATL library have not installed. + *Fix Commit Dialog and Log Dialog default column is wrong + *Fix some dialog can't show after resize and close and open again + *Fix ProgressDlg Sometime thread is dead blocked. + +Version 0.4.1.0 version(external) *Fixed x64 build of TortoiseProc crashed due to received unexpected messages *Fix tag to head when *force* check box checked *Add Git document to help diff --git a/src/TortoiseProc/GitSwitchDlg.cpp b/src/TortoiseProc/GitSwitchDlg.cpp index b8bb445cc..a5db02e4a 100644 --- a/src/TortoiseProc/GitSwitchDlg.cpp +++ b/src/TortoiseProc/GitSwitchDlg.cpp @@ -18,6 +18,8 @@ CGitSwitchDlg::CGitSwitchDlg(CWnd* pParent /*=NULL*/) ,CChooseVersion(this) { m_bBranch=FALSE; + m_bTrack=FALSE; + m_bForce=FALSE; } CGitSwitchDlg::~CGitSwitchDlg() @@ -55,9 +57,9 @@ BOOL CGitSwitchDlg::OnInitDialog() AddAnchor(IDOK,BOTTOM_RIGHT); AddAnchor(IDCANCEL,BOTTOM_RIGHT); - this->AddOthersToAnchor(); CHOOSE_VERSION_ADDANCHOR; + this->AddOthersToAnchor(); EnableSaveRestore(_T("SwitchDlg")); -- 2.11.4.GIT