ATITD-Tools/Desert-Paint-Lab Changeset

Changeset - 78ecf5feebe4

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Jason Maltzen - 9 years ago 2015-12-23 23:52:36
jason@hiddenachievement.com

Fix a crash with potential multi-threaded access to paint recipes.

2 files changed with 17 insertions and 1 deletions:

PaintRecipe.cs

RecipeGeneratorWindow.cs

0 comments (0 inline, 0 general)

PaintRecipe.cs

➞

Show inline comments

@@ ... / @@ -55,12 +55,27 @@ namespace DesertPaintLab @@
         private ReactionSet reactions;
         public PaintRecipe()
+        {
+        }
         public PaintRecipe(PaintRecipe other)
+        {
             this.dirty = true;
             this.reactions = other.reactions;
             foreach (string reagentName in other.reagents)
+            {
                 this.reagents.Add(reagentName);
+            }
             foreach (RecipeIngredient copyIngredient in other.recipe)
+            {
                 RecipeIngredient ingredient = new RecipeIngredient(copyIngredient.name, copyIngredient.quantity);
                 this.recipe.Add(ingredient);
+            }
+        }
         public List<RecipeIngredient> Ingredients
+        {
             get {
                 return recipe;
+            }
+        }

RecipeGeneratorWindow.cs

➞

Show inline comments

@@ ... / @@ -197,12 +197,13 @@ namespace DesertPaintLab @@
+                }
             });
+        }
         protected void OnNewRecipe(object sender, NewRecipeEventArgs args)
+        {
             PaintRecipe recipe = new PaintRecipe(args.Recipe); // copy it
             Gtk.Application.Invoke(delegate
+            {
                 progressBar.Pulse();
                 // TODO: Add item to recipe list only if not already listed
                 bool exists = false;
                 Gtk.TreeIter iter;
@@ ... / @@ -223,13 +224,13 @@ namespace DesertPaintLab @@
                     Console.WriteLine("Add new recipe for {0}", args.Color);
                     //    bool isMissingReactions = args.Recipe.CheckMissingReactions(ref missingReactions);
                     //    string missingReactionLabel = isMissingReactions ? "X" : "";
                     colorStore.AppendValues(args.Color); // , missingReactionLabel);
                     countLabel.Text = String.Format("{0} / {1}", generator.Recipes.Count, Palette.Count);
+                }
-                profile.SetRecipe(args.Recipe);
+                profile.SetRecipe(recipe);
             });
+        }
         protected void OnProgress(object sender, EventArgs args)
+        {
             Gtk.Application.Invoke(delegate

0 comments (0 inline, 0 general)