PATCH [ 1989858 ] Use std::vector in word-diff code(2)

- BugFix: Didn't select word-diff cyclically by pressing F4 key

diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt
index 92b384a..464105a 100644 (file)
--- a/Docs/Users/ChangeLog.txt
+++ b/Docs/Users/ChangeLog.txt
@@ -10,6 +10,7 @@ WinMerge 2.11.1.4
   BugFix: Deleting/Moving file crashed WinMerge in debugger (#2025833)
   Bugfix: Lost focus after folder compare operations (#2046002)
   Bugfix: Some files had folder icons when aborting folder compare (#2018836)
+  BugFix: Didn't select word-diff cyclically by pressing F4 key (#1989858)
   Translation updates:
   - Chinese Traditional (#2039929)
   - Japanese (r5805)

diff --git a/Src/MergeDocLineDiffs.cpp b/Src/MergeDocLineDiffs.cpp
index 373904f..e7bf8f6 100644 (file)
--- a/Src/MergeDocLineDiffs.cpp
+++ b/Src/MergeDocLineDiffs.cpp
@@ -238,7 +238,7 @@ void CMergeDoc::Computelinediff(CCrystalTextView * pView1, CCrystalTextView * pV
        }
 
        // Are we continuing a cycle from the same place ?
-       if (whichdiff >= worddiffs.size())
+       if (whichdiff >= (int)worddiffs.size())
                whichdiff = -2; // Clearly not continuing the same cycle, reset to not in cycle
        
        // After last diff, reset to get full line again