Changeset 1488

Timestamp:

1/9/2010 4:10:17 AM (3 years ago)

Author:

lowjoel

Message:

Fixed crash when editing a pass that was temporary created in the same Settings session. Also, when editing a pass, be sure to update the passes list-view control.

File:

• branches/eraser6/6.0/Eraser.DefaultPlugins/SettingsForm.cs (modified) (3 diffs)

branches/eraser6/6.0/Eraser.DefaultPlugins/SettingsForm.cs

@@ -95 +95 @@
                 //Remove the old definition of the erasure method
                 CustomErasureMethod method = editorForm.Method;
-                if (removeCustomMethods.IndexOf(method.Guid) == -1)
+                if (customMethods.ContainsKey(method.Guid) &&
+                    removeCustomMethods.IndexOf(method.Guid) == -1)
+                {
                     removeCustomMethods.Add(method.Guid);
+                }
 
                 //Add the new definition
                 foreach (CustomErasureMethod addMethod in addCustomMethods)
+                {
                     if (addMethod.Guid == method.Guid)
                     {
@@ -105 +109 @@
                         break;
                     }
-
-                customMethods[method.Guid] = method;
+                }
+
                 addCustomMethods.Add(method);
                 item.Tag = method;
+                UpdateMethod(item);
             }
         }
@@ -185 +190 @@
         }
 
+        /// <summary>
+        /// Updates the UI which represents the given custom erasure method.
+        /// </summary>
+        /// <param name="item">The method to update.</param>
+        private void UpdateMethod(ListViewItem item)
+        {
+            CustomErasureMethod method = (CustomErasureMethod)item.Tag;
+            item.Text = method.Name;
+            item.SubItems[1].Text = method.Passes.Length.ToString(CultureInfo.CurrentCulture);
+        }
+
         private Dictionary<Guid, CustomErasureMethod> customMethods;
         private List<CustomErasureMethod> addCustomMethods = new List<CustomErasureMethod>();