diff --git a/J-Runner/Classes/variables.cs b/J-Runner/Classes/variables.cs index 5f119ef..5522c9a 100644 --- a/J-Runner/Classes/variables.cs +++ b/J-Runner/Classes/variables.cs @@ -80,10 +80,10 @@ public enum Windows W10_11 } - public static string version = "3.3.0"; - public static string build = "3300." + DateTime.ParseExact(Properties.Resources.Build.Trim(), "MM-dd-yyyy HH:mm:ss", null).ToString("yyMMdd.HHmm"); - public const string staticversion = "3.3.0.0"; - public static int revision = 35; + public static string version = "3.3.0 r2"; + public static string build = "3301." + DateTime.ParseExact(Properties.Resources.Build.Trim(), "MM-dd-yyyy HH:mm:ss", null).ToString("yyMMdd.HHmm"); + public const string staticversion = "3.3.0.1"; + public static int revision = 36; public static Windows currentOS = Windows.Unknown; public static bool isWinXP = false; public static bool isscanningip = false; diff --git a/J-Runner/MainForm.cs b/J-Runner/MainForm.cs index 5d7878d..b63fcb3 100644 --- a/J-Runner/MainForm.cs +++ b/J-Runner/MainForm.cs @@ -424,7 +424,7 @@ private void demon_updateFlash(DemoN.Demon_Switch flash) #region LDrivesPanel - public void ldInfo_CloseLDClick() + public void ldInfo_CloseClick() { listInfo.Remove(ldInfo); pnlInfo.Controls.Remove(ldInfo); @@ -439,7 +439,7 @@ public void ldInfo_UpdateAdditional(string file) #endregion - #region xebuild Panel + #region XeBuild Panel public void xPanel_HackChanged() { @@ -513,7 +513,7 @@ public void xsvfChoice_ProgramClick() } - public void xsvfChoice_CloseCRClick() + public void xsvfChoice_CloseClick() { listInfo.Remove(xsvfChoice); pnlInfo.Controls.Remove(xsvfChoice); @@ -1836,6 +1836,15 @@ public void newSession(bool partial = false) xPanel.clear(); variables.ctype = variables.ctypes[0]; txtIP.Text = txtIP.Text.Remove(txtIP.Text.LastIndexOf('.')) + "."; + + if (listInfo.Contains(xsvfChoice)) + { + xsvfChoice_CloseClick(); + } + if (listInfo.Contains(ldInfo)) + { + ldInfo_CloseClick(); + } } progressBar.Value = progressBar.Minimum; @@ -1908,7 +1917,7 @@ void nandinit(bool nomove = false, bool dontUpdateHackType = false) else txtCPUKey.BeginInvoke(new Action(() => txtCPUKey.Text = variables.cpukey)); Console.WriteLine("Initializing {0}, please wait...", Path.GetFileName(variables.filename1)); - if (listInfo.Contains(xsvfChoice)) xsvfChoice_CloseCRClick(); + if (listInfo.Contains(xsvfChoice)) xsvfChoice_CloseClick(); updateProgress(progressBar.Maximum / 2); nand = new Nand.PrivateN(variables.filename1, variables.cpukey); if (!nand.ok) @@ -3640,7 +3649,7 @@ public void openXsvfChoice(bool boardcheck = false) { if (listInfo.Contains(xsvfChoice)) { - xsvfChoice_CloseCRClick(); + xsvfChoice_CloseClick(); } else { diff --git a/J-Runner/Panels/LDrivesInfo.cs b/J-Runner/Panels/LDrivesInfo.cs index 5f17081..150edbe 100644 --- a/J-Runner/Panels/LDrivesInfo.cs +++ b/J-Runner/Panels/LDrivesInfo.cs @@ -60,7 +60,7 @@ private void btnClose_Click(object sender, EventArgs e) { try { - MainForm.mainForm.ldInfo_CloseLDClick(); + MainForm.mainForm.ldInfo_CloseClick(); } catch (Exception) { } } diff --git a/J-Runner/Panels/XSVFChoice.cs b/J-Runner/Panels/XSVFChoice.cs index b7d8dfd..100df34 100644 --- a/J-Runner/Panels/XSVFChoice.cs +++ b/J-Runner/Panels/XSVFChoice.cs @@ -545,7 +545,7 @@ private void btnClose_Click(object sender, EventArgs e) { try { - MainForm.mainForm.xsvfChoice_CloseCRClick(); + MainForm.mainForm.xsvfChoice_CloseClick(); } catch (Exception) { } } diff --git a/J-Runner/Resources/Build.txt b/J-Runner/Resources/Build.txt index d0aef66..e19defd 100644 --- a/J-Runner/Resources/Build.txt +++ b/J-Runner/Resources/Build.txt @@ -1 +1 @@ -07-02-2023 22:30:59 \ No newline at end of file +10-31-2023 00:42:46 \ No newline at end of file