From 94537703476225a486ef89421a1ec37746ad20a4 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Mon, 16 Apr 2012 23:12:09 +0200 Subject: [PATCH] Fixed issue #1065: Explorer crashes when rendering a file conflict icon Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/Git/GitStatus.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index ce5a3c6b8..627de4f21 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -7,6 +7,7 @@ * Fixed issue #1061: Enviroment variables ignored: GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL * Fixed issue #1028: overlays with separate-git-dir (e.g. .git\modules\... for submodules) not working * Fixed issue #1131: "Whole project" checkbox in commit dialog selects all files + * Fixed issue #1065: Explorer crashes when rendering a file conflict icon = Release 1.7.8.0 = == Features== diff --git a/src/Git/GitStatus.cpp b/src/Git/GitStatus.cpp index e54f17cc6..b5080a0d0 100644 --- a/src/Git/GitStatus.cpp +++ b/src/Git/GitStatus.cpp @@ -1477,7 +1477,7 @@ int GitStatus::GetDirStatus(const CString &gitdir,const CString &subpath,git_wc_ int hstart,hend; GetRangeInSortVector(*treeptr,lowcasepath.GetBuffer(),lowcasepath.GetLength(),&hstart,&hend,pos); CGitHeadFileList::iterator hit; - hit = treeptr->begin()+start; + hit = treeptr->begin() + hstart; CGitHeadFileList::iterator lastElement = treeptr->end(); for(int i=hstart; i <= hend && hit != lastElement; i++) { -- 2.11.4.GIT