PATCH: [ 2590212 ] ccrystaltextbuffer

 Submitted by Matthias Mayer, edited by Kimmo

diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt
index 8d1e978..68bba28 100644 (file)
--- a/Docs/Users/ChangeLog.txt
+++ b/Docs/Users/ChangeLog.txt
@@ -8,6 +8,7 @@ WinMerge 2.13.3
   Bugfix: Could not copy files from right to left (#2556904)
   Bugfix: Don't show file name extension for folders (#2563314)
   Bugfix: Help window opened from WinMerge was modal (#2590079)
+  Bugfix: Crash in editor when undoing (#2590212)
   Translation updates:
   - Dutch (#2590430)
   - French (#2551043, #2551066)

diff --git a/Src/editlib/ccrystaltextbuffer.cpp b/Src/editlib/ccrystaltextbuffer.cpp
index 63c4d3b..3d63cdf 100644 (file)
--- a/Src/editlib/ccrystaltextbuffer.cpp
+++ b/Src/editlib/ccrystaltextbuffer.cpp
@@ -1302,10 +1302,10 @@ GetRedoActionCode (int & nAction, POSITION pos /*= NULL*/ )
     {
       nPosition++;
       vector<UndoRecord>::const_iterator iter = m_aUndoBuf.begin () + nPosition;
-      while (iter != m_aUndoBuf.begin () && ((*iter).m_dwFlags & UNDO_BEGINGROUP) == 0)
+      while (iter != m_aUndoBuf.end () && ((*iter).m_dwFlags & UNDO_BEGINGROUP) == 0)
         {
-          --iter;
-          --nPosition;
+          ++iter;
+          ++nPosition;
         }
     }
   if (nPosition >= m_aUndoBuf.size ())