• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revisión29424 (tree)
Tiempo2022-06-25 02:02:40
Autorstefankueng

Log Message

don't reset the modified state when redo after saving

Cambiar Resumen

Diferencia incremental

--- trunk/src/Changelog.txt (revision 29423)
+++ trunk/src/Changelog.txt (revision 29424)
@@ -5,6 +5,7 @@
55 at the end. (Daniel Sahlberg)
66 - NEW: add autocomplete functionality in the log dialog
77 used in Repository browser. (Daniel Sahlberg)
8+- BUG: Crash in TMerge when doing Redo after saving. (Stefan)
89
910 Version 1.14.3
1011 - BUG: clipboard wasn't closed after pasting into
--- trunk/src/TortoiseMerge/Undo.cpp (revision 29423)
+++ trunk/src/TortoiseMerge/Undo.cpp (revision 29424)
@@ -1,6 +1,6 @@
11 // TortoiseMerge - a Diff/Patch program
22
3-// Copyright (C) 2006-2007, 2010-2011, 2013-2015, 2021 - TortoiseSVN
3+// Copyright (C) 2006-2007, 2010-2011, 2013-2015, 2021-2022 - TortoiseSVN
44
55 // This program is free software; you can redistribute it and/or
66 // modify it under the terms of the GNU General Public License
@@ -303,7 +303,7 @@
303303 if (pLeft)
304304 {
305305 bool bModified = (m_originalStateLeft != static_cast<size_t>(-1));
306- if (!bModified)
306+ if (!bModified && !m_redoViewStates.empty())
307307 {
308308 std::list<AllViewState>::iterator i = m_redoViewStates.begin();
309309 std::advance(i, m_originalStateLeft);
@@ -327,7 +327,7 @@
327327 if (pRight)
328328 {
329329 bool bModified = (m_originalStateRight != static_cast<size_t>(-1));
330- if (!bModified)
330+ if (!bModified && !m_redoViewStates.empty())
331331 {
332332 std::list<AllViewState>::iterator i = m_redoViewStates.begin();
333333 std::advance(i, m_originalStateRight);
Show on old repository browser