Merge pull request #1 from MarinaGryphon/patch-1

Fixes duplicate ElementType entries.
Zekka · Jul 10, 2018 · 545e08a · 545e08a
2 parents bbbd69a + 2765c16
commit 545e08a
Showing 1 changed file with 2 additions and 41 deletions.
diff --git a/Labyrinth3/IDE/Forms/MergeElementsDlg.cs b/Labyrinth3/IDE/Forms/MergeElementsDlg.cs
@@ -125,7 +125,7 @@ private void InitializeComponent()
             this.TypeBox.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
             this.TypeBox.DrawMode = DrawMode.OwnerDrawVariable;
             this.TypeBox.DropDownStyle = ComboBoxStyle.DropDownList;
-            this.TypeBox.Items.AddRange(new object[52]
+            this.TypeBox.Items.AddRange(new object[ ]
             {
         (object) ElementType.Generic,
         (object) ElementType.Character,
@@ -140,45 +140,6 @@ private void InitializeComponent()
         (object) ElementType.Concept,
         (object) ElementType.Object,
         (object) ElementType.Event,
-        (object) ElementType.Generic,
-        (object) ElementType.Character,
-        (object) ElementType.Organisation,
-        (object) ElementType.Website,
-        (object) ElementType.EmailAccount,
-        (object) ElementType.PhoneNumber,
-        (object) ElementType.File,
-        (object) ElementType.Puzzle,
-        (object) ElementType.Location,
-        (object) ElementType.Vehicle,
-        (object) ElementType.Concept,
-        (object) ElementType.Object,
-        (object) ElementType.Event,
-        (object) ElementType.Generic,
-        (object) ElementType.Character,
-        (object) ElementType.Organisation,
-        (object) ElementType.Website,
-        (object) ElementType.EmailAccount,
-        (object) ElementType.PhoneNumber,
-        (object) ElementType.File,
-        (object) ElementType.Puzzle,
-        (object) ElementType.Location,
-        (object) ElementType.Vehicle,
-        (object) ElementType.Concept,
-        (object) ElementType.Object,
-        (object) ElementType.Event,
-        (object) ElementType.Generic,
-        (object) ElementType.Character,
-        (object) ElementType.Organisation,
-        (object) ElementType.Website,
-        (object) ElementType.EmailAccount,
-        (object) ElementType.PhoneNumber,
-        (object) ElementType.File,
-        (object) ElementType.Puzzle,
-        (object) ElementType.Location,
-        (object) ElementType.Vehicle,
-        (object) ElementType.Concept,
-        (object) ElementType.Object,
-        (object) ElementType.Event
             });
             this.TypeBox.Location = new Point(64, 304);
             this.TypeBox.Name = "TypeBox";
@@ -269,4 +230,4 @@ private void light_ok()
             this.OKBtn.Enabled = this.text && this.selected > 1;
         }
     }
-}
+}