From f67de7a23b422508df94156113c2403f6939eab1 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Mon, 10 May 2021 04:35:59 +1000 Subject: [PATCH] Fix NRE when loading HelloWorld ext. tool --- .../HelloWorld/CustomMainForm.cs | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/ExternalToolProjects/HelloWorld/CustomMainForm.cs b/ExternalToolProjects/HelloWorld/CustomMainForm.cs index 27ddffa536..ee53caf7c4 100644 --- a/ExternalToolProjects/HelloWorld/CustomMainForm.cs +++ b/ExternalToolProjects/HelloWorld/CustomMainForm.cs @@ -71,21 +71,23 @@ namespace HelloWorld InitializeComponent(); label_GameHash.Click += label_GameHash_Click; Closing += (sender, args) => APIs.EmuClient.SetClientExtraPadding(0, 0, 0, 0); - - APIs.EmuClient.BeforeQuickSave += (sender, e) => + Load += (_, _) => { - if (e.Slot != 0) return; // only take effect on slot 0 - var basePath = Path.Combine(GlobalConfig.PathEntries.SaveStateAbsolutePath(APIs.Emulation.GetSystemId()), "Test"); - if (!Directory.Exists(basePath)) Directory.CreateDirectory(basePath); - APIs.EmuClient.SaveState(Path.Combine(basePath, e.Name)); - e.Handled = true; - }; - APIs.EmuClient.BeforeQuickLoad += (sender, e) => - { - if (e.Slot != 0) return; // only take effect on slot 0 - var basePath = Path.Combine(GlobalConfig.PathEntries.SaveStateAbsolutePath(APIs.Emulation.GetSystemId()), "Test"); - APIs.EmuClient.LoadState(Path.Combine(basePath, e.Name)); - e.Handled = true; + APIs.EmuClient.BeforeQuickSave += (_, e) => + { + if (e.Slot != 0) return; // only take effect on slot 0 + var basePath = Path.Combine(GlobalConfig.PathEntries.SaveStateAbsolutePath(APIs.Emulation.GetSystemId()), "Test"); + if (!Directory.Exists(basePath)) Directory.CreateDirectory(basePath); + APIs.EmuClient.SaveState(Path.Combine(basePath, e.Name)); + e.Handled = true; + }; + APIs.EmuClient.BeforeQuickLoad += (_, e) => + { + if (e.Slot != 0) return; // only take effect on slot 0 + var basePath = Path.Combine(GlobalConfig.PathEntries.SaveStateAbsolutePath(APIs.Emulation.GetSystemId()), "Test"); + APIs.EmuClient.LoadState(Path.Combine(basePath, e.Name)); + e.Handled = true; + }; }; }