From 6504d5305ad7681a3eb4f8b95c08885145ca0ab9 Mon Sep 17 00:00:00 2001 From: Evan Dixon Date: Tue, 7 Feb 2017 23:12:18 -0600 Subject: [PATCH 1/2] Fixed settings not saving when form closes Should resolve #833. This is why I prefer if statement logic to return statements littered everywhere. --- PKHeX.WinForms/MainWindow/Main.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/PKHeX.WinForms/MainWindow/Main.cs b/PKHeX.WinForms/MainWindow/Main.cs index ce33c1461..805f94dbf 100644 --- a/PKHeX.WinForms/MainWindow/Main.cs +++ b/PKHeX.WinForms/MainWindow/Main.cs @@ -3118,10 +3118,14 @@ private void dragoutDrop(object sender, DragEventArgs e) private void Main_FormClosing(object sender, FormClosingEventArgs e) { - if (!SAV.Edited) - return; - if (DialogResult.Yes != WinFormsUtil.Prompt(MessageBoxButtons.YesNo, "Any unsaved changes will be lost.", "Are you sure you want to close PKHeX?")) - { e.Cancel = true; return; } + if (SAV.Edited) + { + if (SAV.Edited && DialogResult.Yes != WinFormsUtil.Prompt(MessageBoxButtons.YesNo, "Any unsaved changes will be lost.", "Are you sure you want to close PKHeX?")) + { + e.Cancel = true; + return; + } + } try { Properties.Settings.Default.Save(); } catch (Exception x) { File.WriteAllLines("config error.txt", new[] {x.ToString()}); } From bd4b40062650098e62cf8030a9ae085e26e741e4 Mon Sep 17 00:00:00 2001 From: Evan Dixon Date: Tue, 7 Feb 2017 23:13:33 -0600 Subject: [PATCH 2/2] Cleanup Whoops. --- PKHeX.WinForms/MainWindow/Main.cs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/PKHeX.WinForms/MainWindow/Main.cs b/PKHeX.WinForms/MainWindow/Main.cs index 805f94dbf..c01152956 100644 --- a/PKHeX.WinForms/MainWindow/Main.cs +++ b/PKHeX.WinForms/MainWindow/Main.cs @@ -3118,17 +3118,14 @@ private void dragoutDrop(object sender, DragEventArgs e) private void Main_FormClosing(object sender, FormClosingEventArgs e) { - if (SAV.Edited) + if (SAV.Edited && DialogResult.Yes != WinFormsUtil.Prompt(MessageBoxButtons.YesNo, "Any unsaved changes will be lost.", "Are you sure you want to close PKHeX?")) { - if (SAV.Edited && DialogResult.Yes != WinFormsUtil.Prompt(MessageBoxButtons.YesNo, "Any unsaved changes will be lost.", "Are you sure you want to close PKHeX?")) - { - e.Cancel = true; - return; - } + e.Cancel = true; + return; } try { Properties.Settings.Default.Save(); } - catch (Exception x) { File.WriteAllLines("config error.txt", new[] {x.ToString()}); } + catch (Exception x) { File.WriteAllLines("config error.txt", new[] { x.ToString() }); } } #endregion