From 6eff348fa5ff46e66237f4f9348fe23682c56919 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 9 May 2020 10:35:14 -0700 Subject: [PATCH] Disconnect on form close too same as https://github.com/kwsch/NHSE/commit/39205c975e48411bd09b363fc8bafc33d0e6ed5f --- .../Subforms/SysBot/SysBotRAMEdit.Designer.cs | 3 ++- NHSE.WinForms/Subforms/SysBot/SysBotRAMEdit.cs | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/NHSE.WinForms/Subforms/SysBot/SysBotRAMEdit.Designer.cs b/NHSE.WinForms/Subforms/SysBot/SysBotRAMEdit.Designer.cs index ccd7864..99fc1d0 100644 --- a/NHSE.WinForms/Subforms/SysBot/SysBotRAMEdit.Designer.cs +++ b/NHSE.WinForms/Subforms/SysBot/SysBotRAMEdit.Designer.cs @@ -104,7 +104,7 @@ private void InitializeComponent() this.GB_Inject.TabStop = false; this.GB_Inject.Text = "Injector"; // - // numericUpDown1 + // NUD_Offset // this.NUD_Offset.Location = new System.Drawing.Point(73, 39); this.NUD_Offset.Maximum = new decimal(new int[] { @@ -178,6 +178,7 @@ private void InitializeComponent() this.Name = "SysBotRAMEdit"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "SysBotUI"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.SysBotRAMEdit_FormClosing); this.GB_Inject.ResumeLayout(false); this.GB_Inject.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Offset)).EndInit(); diff --git a/NHSE.WinForms/Subforms/SysBot/SysBotRAMEdit.cs b/NHSE.WinForms/Subforms/SysBot/SysBotRAMEdit.cs index 294e527..11bae67 100644 --- a/NHSE.WinForms/Subforms/SysBot/SysBotRAMEdit.cs +++ b/NHSE.WinForms/Subforms/SysBot/SysBotRAMEdit.cs @@ -28,6 +28,23 @@ private void B_Connect_Click(object sender, EventArgs e) GB_Inject.Enabled = true; } + private void SysBotRAMEdit_FormClosing(object sender, FormClosingEventArgs e) + { + if (!Bot.Bot.Connected) + return; + + try + { + Bot.Bot.Disconnect(); + } +#pragma warning disable CA1031 // Do not catch general exception types + catch (Exception ex) +#pragma warning restore CA1031 // Do not catch general exception types + { + Console.WriteLine(ex.Message); + } + } + private void B_Edit_Click(object sender, EventArgs e) { var offset = StringUtil.GetHexValue(RamOffset.Text);