From 2abd4a2441740b8e55745136db603b58a06644f7 Mon Sep 17 00:00:00 2001 From: "J. Lord" Date: Mon, 5 Nov 2018 18:05:34 -0800 Subject: [PATCH] Fix #391: prevent Metronome Mode softlock (#392) * Fix #391: Metronome Mode causes catching tut. softlock * Fix #391: Metronome Mode causes catching tut. softlock --- pk3DS/Subforms/Gen6/MoveEditor6.cs | 6 ++++-- pk3DS/Subforms/Gen7/MoveEditor7.cs | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pk3DS/Subforms/Gen6/MoveEditor6.cs b/pk3DS/Subforms/Gen6/MoveEditor6.cs index 9ea1d7c..98e3cd3 100644 --- a/pk3DS/Subforms/Gen6/MoveEditor6.cs +++ b/pk3DS/Subforms/Gen6/MoveEditor6.cs @@ -209,13 +209,15 @@ private void B_Metronome_Click(object sender, EventArgs e) for (int i = 0; i < CB_Move.Items.Count; i++) { CB_Move.SelectedIndex = i; - if (CB_Move.SelectedIndex != 117) + if (CB_Move.SelectedIndex != 117 || CB_Move.SelectedIndex != 32) NUD_PP.Value = 0; if (CB_Move.SelectedIndex == 117) NUD_PP.Value = 40; + if (CB_Move.SelectedIndex == 32) + NUD_PP.Value = 1; } CB_Move.SelectedIndex = 0; WinFormsUtil.Alert("All Moves have had their Base PP values modified!"); } } -} \ No newline at end of file +} diff --git a/pk3DS/Subforms/Gen7/MoveEditor7.cs b/pk3DS/Subforms/Gen7/MoveEditor7.cs index 7837864..cf46c9f 100644 --- a/pk3DS/Subforms/Gen7/MoveEditor7.cs +++ b/pk3DS/Subforms/Gen7/MoveEditor7.cs @@ -271,13 +271,15 @@ private void B_Metronome_Click(object sender, EventArgs e) for (int i = 0; i < CB_Move.Items.Count; i++) { CB_Move.SelectedIndex = i; - if (CB_Move.SelectedIndex != 117) + if (CB_Move.SelectedIndex != 117 || CB_Move.SelectedIndex != 32) NUD_PP.Value = 0; if (CB_Move.SelectedIndex == 117) NUD_PP.Value = 40; + if (CB_Move.SelectedIndex == 32) + NUD_PP.Value = 1; } CB_Move.SelectedIndex = 0; WinFormsUtil.Alert("All Moves have had their Base PP values modified!"); } } -} \ No newline at end of file +}