From 3db83e845637636339e077952f56fb6c2650bf04 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sun, 18 Feb 2018 20:57:52 +0900 Subject: [PATCH] MergeDoc.cpp: Fix wrong if condition. sf.net#2202 --- Src/MergeDoc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp index 83c291e02..00fe42121 100644 --- a/Src/MergeDoc.cpp +++ b/Src/MergeDoc.cpp @@ -1095,7 +1095,7 @@ bool CMergeDoc::ListCopy(int srcPane, int dstPane, int nDiff /* = -1*/, int nActiveViewIndexType = GetActiveMergeViewIndexType(); if (nActiveViewIndexType >= MERGEVIEW_PANE0 && nActiveViewIndexType <= MERGEVIEW_PANE2) ptCursor = m_pView[nActiveViewIndexType]->GetCursorPos(); - else if (nActiveViewIndexType >= MERGEVIEW_PANE0_DETAIL || + else if (nActiveViewIndexType >= MERGEVIEW_PANE0_DETAIL && nActiveViewIndexType <= MERGEVIEW_PANE2_DETAIL) { ptCursor = m_pView[nActiveViewIndexType - MERGEVIEW_PANE0_DETAIL]->GetCursorPos(); -- 2.11.0