From f3445605ae429d0bb86ba8d5c06db4bf6ccbf135 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 12 Feb 2009 15:46:11 +0000 Subject: [PATCH] PATCH: [ 2590212 ] ccrystaltextbuffer Submitted by Matthias Mayer, edited by Kimmo --- Docs/Users/ChangeLog.txt | 1 + Src/editlib/ccrystaltextbuffer.cpp | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 8d1e978c4..68bba28f1 100644 --- 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 63c4d3ba5..3d63cdf2b 100644 --- a/Src/editlib/ccrystaltextbuffer.cpp +++ b/Src/editlib/ccrystaltextbuffer.cpp @@ -1302,10 +1302,10 @@ GetRedoActionCode (int & nAction, POSITION pos /*= NULL*/ ) { nPosition++; vector::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 ()) -- 2.11.0