Fix problem of not moving to conflicted line after auto-merge

WinMerge · Apr 22, 2023 · 5cd81bf · 5cd81bf
1 parent b79afb7
commit 5cd81bf
Showing 1 changed file with 17 additions and 8 deletions.
diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
@@ -3339,15 +3339,24 @@ void CMergeDoc::MoveOnLoad(int nPane, int nLineIndex, bool bRealLine, int nCharI
 	}
 	if (nLineIndex == -1)
 	{
-		// scroll to first diff
-		if (GetOptionsMgr()->GetBool(OPT_SCROLL_TO_FIRST) &&
-			m_diffList.HasSignificantDiffs())
+		if (this->GetCurrentDiff() != -1)
 		{
-			int nDiff = m_diffList.FirstSignificantDiff();
-			if (nDiff != -1)
-				m_pView[0][nPane]->SelectDiff(nDiff, true, false);
-			m_pView[0][nPane]->SetActivePane();
-			return;
+			DIFFRANGE di;
+			m_diffList.GetDiff(this->GetCurrentDiff(), di);
+			nLineIndex = bRealLine ? di.begin[nPane] : di.dbegin;
+		}
+		else
+		{
+			// scroll to first diff
+			if (GetOptionsMgr()->GetBool(OPT_SCROLL_TO_FIRST) &&
+				m_diffList.HasSignificantDiffs())
+			{
+				int nDiff = m_diffList.FirstSignificantDiff();
+				if (nDiff != -1)
+					m_pView[0][nPane]->SelectDiff(nDiff, true, false);
+				m_pView[0][nPane]->SetActivePane();
+				return;
+			}
 		}
 	}
 	m_pView[0][nPane]->GotoLine(nLineIndex < 0 ? 0 : nLineIndex, bRealLine, nPane, true, nCharIndex);