From 5cc8d1de5c8fa55620ea19983b5d6d183cf1cab6 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 28 Jan 2017 15:20:11 -0800 Subject: [PATCH] Fix clickLegality calling existing logic put mnuLLegality back into mnuL, causing the getSlot call to return -1 (not from a box/party slot, ie read from tabs). new logic should have the intended behavior --- PKHeX.WinForms/MainWindow/Main.cs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/PKHeX.WinForms/MainWindow/Main.cs b/PKHeX.WinForms/MainWindow/Main.cs index 3bd28b411..f9a48cc58 100644 --- a/PKHeX.WinForms/MainWindow/Main.cs +++ b/PKHeX.WinForms/MainWindow/Main.cs @@ -129,15 +129,18 @@ public Main() { c.Opening += (sender, e) => { + var items = ((ContextMenuStrip)sender).Items; if (ModifierKeys == Keys.Control) - ((ContextMenuStrip)sender).Items.Add(mnuLLegality); - }; - c.Closing += (sender, e) => - { - if (((ContextMenuStrip)sender).Items.Contains(mnuLLegality)) - mnuL.Items.Add(mnuLLegality); + items.Add(mnuLLegality); + else if (items.Contains(mnuLLegality)) + items.Remove(mnuLLegality); }; } + mnuL.Opening += (sender, e) => + { + if (mnuL.Items[0] != mnuLLegality) + mnuL.Items.Insert(0, mnuLLegality); + }; // Load WC6 folder to legality refreshWC6DB();