From a058c7476ffc7fa26aabe84d21186eb4f8dd91e8 Mon Sep 17 00:00:00 2001
From: Sup Yut Sum <ch3cooli@gmail.com>
Date: Wed, 11 Jun 2014 00:01:31 +0800
Subject: [PATCH] TortoiseGitMerge: Fix crash when pressing Home key if Wrap
 Long Lines is enabled

Based on TortoiseSVN revision 25561

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
---
 src/TortoiseMerge/BaseView.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TortoiseMerge/BaseView.cpp b/src/TortoiseMerge/BaseView.cpp
index e799fe30a..0b4d1c80a 100644
--- a/src/TortoiseMerge/BaseView.cpp
+++ b/src/TortoiseMerge/BaseView.cpp
@@ -2936,7 +2936,7 @@ void CBaseView::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
 			else
 			{
 				POINT ptCaretPos = GetCaretPosition();
-				const CString &sLine = GetViewLine(ptCaretPos.y);
+				CString sLine = GetLineChars(ptCaretPos.y);
 				int pos = 0;
 				while (pos < sLine.GetLength())
 				{
-- 
2.11.4.GIT