Merge rev.7791

[winmerge-jp/winmerge-jp.git] / Src / MergeEditView.cpp

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index 9962540..18caacf 100644 (file)
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -505,6 +505,9 @@ void CMergeEditView::GetLineColors(int nLineIndex, COLORREF & crBkgnd,
 void CMergeEditView::GetLineColors2(int nLineIndex, DWORD ignoreFlags, COLORREF & crBkgnd,
                                 COLORREF & crText, BOOL & bDrawWhitespace)
 {
+       if (GetLineCount() <= nLineIndex)
+               return;
+
        DWORD dwLineFlags = GetLineFlags(nLineIndex);
 
        if (dwLineFlags & ignoreFlags)