Fix SwitchDlg assert fail

Signed-off-by: Frank Li <lznuaa@gmail.com>

diff --git a/src/Changelog.txt b/src/Changelog.txt
index 17d46be..59d6090 100644 (file)
--- a/src/Changelog.txt
+++ b/src/Changelog.txt
@@ -1,4 +1,10 @@
-Version 0.4.1.0 version(internal)\r
+Version 0.4.2.0 version(external)\r
+       *Fix Shell menu disappear because ATL library have not installed. \r
+       *Fix Commit Dialog and Log Dialog default column is wrong \r
+       *Fix some dialog can't show after resize and close and open again\r
+       *Fix ProgressDlg Sometime thread is dead blocked.\r
+\r
+Version 0.4.1.0 version(external)\r
         *Fixed x64 build of TortoiseProc crashed due to received unexpected messages\r
        *Fix tag to head when *force* check box checked\r
        *Add Git document to help\r

diff --git a/src/TortoiseProc/GitSwitchDlg.cpp b/src/TortoiseProc/GitSwitchDlg.cpp
index b8bb445..a5db02e 100644 (file)
--- a/src/TortoiseProc/GitSwitchDlg.cpp
+++ b/src/TortoiseProc/GitSwitchDlg.cpp
@@ -18,6 +18,8 @@ CGitSwitchDlg::CGitSwitchDlg(CWnd* pParent /*=NULL*/)
        ,CChooseVersion(this)\r
 {\r
        m_bBranch=FALSE;\r
+       m_bTrack=FALSE;\r
+       m_bForce=FALSE;\r
 }\r
 \r
 CGitSwitchDlg::~CGitSwitchDlg()\r
@@ -55,9 +57,9 @@ BOOL CGitSwitchDlg::OnInitDialog()
 \r
        AddAnchor(IDOK,BOTTOM_RIGHT);\r
        AddAnchor(IDCANCEL,BOTTOM_RIGHT);\r
-       this->AddOthersToAnchor();\r
        \r
        CHOOSE_VERSION_ADDANCHOR;\r
+       this->AddOthersToAnchor();\r
 \r
        EnableSaveRestore(_T("SwitchDlg"));\r
 \r