From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 13 Nov 2001 14:27:00 +0000 (+0000)
Subject: fixed bug with redoing the command when there was nothing to redo
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/17271c793e0d938dc4a189b540b6438ce1839230

fixed bug with redoing the command when there was nothing to redo


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/cmdproc.cpp b/src/common/cmdproc.cpp
index c2d44c895b..f6d7eb8dd5 100644
--- a/src/common/cmdproc.cpp
+++ b/src/common/cmdproc.cpp
@@ -154,12 +154,17 @@ bool wxCommandProcessor::Redo()
 {
     wxCommand *redoCommand = (wxCommand *) NULL;
     wxNode *redoNode = (wxNode *) NULL;
-    if (m_currentCommand && m_currentCommand->Next())
+
+    if ( m_currentCommand )
     {
-        redoCommand = (wxCommand *)m_currentCommand->Next()->Data();
-        redoNode = m_currentCommand->Next();
+        // is there anything to redo?
+        if ( m_currentCommand->Next() )
+        {
+            redoCommand = (wxCommand *)m_currentCommand->Next()->Data();
+            redoNode = m_currentCommand->Next();
+        }
     }
-    else
+    else // no current command, redo the first one
     {
         if (m_commands.Number() > 0)
         {