Misc fixes

Off by 1 for MemArgType div/0 for no instructions Thanks Davil! https://projectpokemon.org/home/forums/topic/45324-menories-error/
kwsch · May 21, 2018 · bbe6762 · bbe6762
1 parent 815ba9d
commit bbe6762
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/PKHeX.Core/Editing/Bulk/BatchEditor.cs b/PKHeX.Core/Editing/Bulk/BatchEditor.cs
@@ -51,6 +51,8 @@ public bool ProcessPKM(PKM pkm, IEnumerable<StringInstruction> filters, IEnumera
         /// <returns>Friendly (multi-line) string indicating the result of the batch edits.</returns>
         public string GetEditorResults(ICollection<StringInstructionSet> sets)
         {
+            if (sets.Count == 0)
+                return MsgBEInstructionNone;
             int ctr = Modified / sets.Count;
             int len = Iterated / sets.Count;
             string maybe = sets.Count == 1 ? string.Empty : "~";

diff --git a/PKHeX.WinForms/Subforms/PKM Editors/MemoryAmie.cs b/PKHeX.WinForms/Subforms/PKM Editors/MemoryAmie.cs
@@ -212,15 +212,15 @@ private void UpdateMemoryDisplay(object sender)
                 CB_CTVar.DisplayMember = nameof(ComboItem.Text);
                 CB_CTVar.ValueMember = nameof(ComboItem.Value);
                 CB_CTVar.DataSource = argvals;
-                LCTV.Text = vartypes[(int)memIndex];
+                LCTV.Text = vartypes[(int)memIndex - 1];
                 LCTV.Visible = CB_CTVar.Visible = CB_CTVar.Enabled = argvals.Count > 1;
             }
             else
             {
                 CB_OTVar.DisplayMember = nameof(ComboItem.Text);
                 CB_OTVar.ValueMember = nameof(ComboItem.Value);
                 CB_OTVar.DataSource = argvals;
-                LOTV.Text = vartypes[(int)memIndex];
+                LOTV.Text = vartypes[(int)memIndex - 1];
                 LOTV.Visible = CB_OTVar.Visible = CB_OTVar.Enabled = argvals.Count > 1;
             }
         }