HistoryLister: bug fix; single undo action was undoing first two oper…

…ations.
remsmeru · Sep 4, 2014 · 88cf9df · 88cf9df
1 parent 0bb0d34
commit 88cf9df
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/Framework/Atf.Gui.WinForms/Applications/Listers/HistoryLister.cs b/Framework/Atf.Gui.WinForms/Applications/Listers/HistoryLister.cs
@@ -30,6 +30,7 @@ void IInitializable.Initialize()
                 {
                     try
                     {
+                        if (m_udpatingIndex) return;
                         m_undoingOrRedoing = true;
                         int indexLastDone = m_commandHistory.Current - 1;
                         int cmdIndex = m_listbox.SelectedIndex + m_startIndex;
@@ -171,11 +172,19 @@ private void m_commandHistory_CommandDone(object sender, EventArgs e)
         private void UpdatedSelectedIndex()
         {
             if (m_undoingOrRedoing) return;
-            m_listbox.BeginUpdate();
-            int selectedIndex = (m_commandHistory.Current - 1) - m_startIndex;
-            if (selectedIndex < -1) selectedIndex = -1;
-            m_listbox.SelectedIndex = selectedIndex;
-            m_listbox.EndUpdate();
+            try
+            {
+                m_udpatingIndex = true;
+                m_listbox.BeginUpdate();
+                int selectedIndex = (m_commandHistory.Current - 1) - m_startIndex;
+                if (selectedIndex < -1) selectedIndex = -1;
+                m_listbox.SelectedIndex = selectedIndex;
+                m_listbox.EndUpdate();
+            }
+            finally
+            {
+                m_udpatingIndex = false;
+            }
         }
         private void BuildList()
         {
@@ -214,8 +223,8 @@ private void ComputeColors()
 
         [Import(AllowDefault = true)]
         private ISettingsService m_settingsService;
-
 
+        private bool m_udpatingIndex;
         private int m_startIndex;
         private int m_lastCmdCount; // last command count.        
         private CommandHistory m_commandHistory;