Changeset 1477

Timestamp:

1/6/2010 7:29:53 AM (3 years ago)

Author:

lowjoel

Message:

Don't crash when editing a custom erasure method multiple times

File:

• branches/eraser6/6.0/Eraser.DefaultPlugins/SettingsForm.cs (modified) (1 diff)

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

@@ -91 +91 @@
                 //Remove the old definition of the erasure method
                 CustomErasureMethod method = editorForm.Method;
-                removeCustomMethods.Add(method.Guid);
-                customMethod.Items.Remove(item);
-                customMethods.Remove(method.Guid);
+                if (removeCustomMethods.IndexOf(method.Guid) == -1)
+                    removeCustomMethods.Add(method.Guid);
 
                 //Add the new definition
-                method = editorForm.Method;
+                foreach (CustomErasureMethod addMethod in addCustomMethods)
+                    if (addMethod.Guid == method.Guid)
+                    {
+                        addCustomMethods.Remove(addMethod);
+                        break;
+                    }
+
+                customMethods[method.Guid] = method;
                 addCustomMethods.Add(method);
-                AddMethod(method);
+                item.Tag = method;
             }
         }