From 7554f00283a98f0ec47ea97d0ac07149111bcfd5 Mon Sep 17 00:00:00 2001 From: Frank Li Date: Wed, 21 Jan 2009 23:35:44 +0800 Subject: [PATCH] Fix memory leak when add colorpages Signed-off-by: Frank Li --- src/Git/Git.cpp | 3 ++- src/TortoiseProc/Settings/Settings.cpp | 2 ++ src/TortoiseProc/TortoiseProc.cpp | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp index 2666f6f46..c2afaaf74 100644 --- a/src/Git/Git.cpp +++ b/src/Git/Git.cpp @@ -134,7 +134,8 @@ int CGit::Run(CString cmd, CString* output,int code) if(ret) return ret; - + + vector.push_back(0); StringAppend(output,&(vector[0]),code); return 0; } diff --git a/src/TortoiseProc/Settings/Settings.cpp b/src/TortoiseProc/Settings/Settings.cpp index 91563b215..782c2e2ac 100644 --- a/src/TortoiseProc/Settings/Settings.cpp +++ b/src/TortoiseProc/Settings/Settings.cpp @@ -118,6 +118,8 @@ void CSettings::RemovePropPages() //// delete m_pLogCachePage; //// delete m_pLogCacheListPage; delete m_pColorsPage; + delete m_pColorsPage2; + delete m_pColorsPage3; delete m_pSavedPage; // delete m_pHooksPage; delete m_pBugTraqPage; diff --git a/src/TortoiseProc/TortoiseProc.cpp b/src/TortoiseProc/TortoiseProc.cpp index d2bc778a1..490701ecc 100644 --- a/src/TortoiseProc/TortoiseProc.cpp +++ b/src/TortoiseProc/TortoiseProc.cpp @@ -120,6 +120,7 @@ BOOL CTortoiseProcApp::InitInstance() CMFCVisualManager::SetDefaultManager(RUNTIME_CLASS(CMFCVisualManagerWindows)); CMFCButton::EnableWindowsTheming(); + if(!CheckMsysGitDir()) { if(CMessageBox::Show(NULL,_T("MSysGit(http://code.google.com/p/msysgit) have not installed Correctly\n\ -- 2.11.4.GIT