From 796d0652e417aa3b320753db4433c413c729f785 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Fri, 7 May 2021 00:11:43 +1000 Subject: [PATCH] Clean up ported vs hawk core handling in BizBoxInfoControl --- .../BizBoxInfoControl.Designer.cs | 3 ++- src/BizHawk.Client.EmuHawk/BizBoxInfoControl.cs | 13 ++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/BizBoxInfoControl.Designer.cs b/src/BizHawk.Client.EmuHawk/BizBoxInfoControl.Designer.cs index 965f3ed6cf..63bd3d1780 100644 --- a/src/BizHawk.Client.EmuHawk/BizBoxInfoControl.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/BizBoxInfoControl.Designer.cs @@ -58,7 +58,7 @@ this.CorePortedLabel.Location = new System.Drawing.Point(140, 0); this.CorePortedLabel.Name = "CorePortedLabel"; this.CorePortedLabel.Padding = new System.Windows.Forms.Padding(5, 5, 0, 0); - this.CorePortedLabel.Text = "label3"; + this.CorePortedLabel.Text = ""; // // CoreUrlLink // @@ -71,6 +71,7 @@ this.CoreUrlLink.TabIndex = 3; this.CoreUrlLink.TabStop = true; this.CoreUrlLink.Text = "linkLabel1"; + this.CoreUrlLink.Visible = false; this.CoreUrlLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.CoreUrlLink_LinkClicked); // // BizBoxInfoControl diff --git a/src/BizHawk.Client.EmuHawk/BizBoxInfoControl.cs b/src/BizHawk.Client.EmuHawk/BizBoxInfoControl.cs index 8e89557b39..1a5cac307c 100644 --- a/src/BizHawk.Client.EmuHawk/BizBoxInfoControl.cs +++ b/src/BizHawk.Client.EmuHawk/BizBoxInfoControl.cs @@ -21,17 +21,12 @@ namespace BizHawk.Client.EmuHawk CoreAuthorLabel.Visible = false; } - CorePortedLabel.Text = attributes.Ported ? " (Ported)" : ""; - - if (!attributes.Ported) + if (attributes.Ported) { - CoreUrlLink.Visible = false; - } - else - { - CoreUrlLink.Visible = true; - CoreUrlLink.Text = attributes.PortedVersion; + CorePortedLabel.Text = " (Ported)"; _url = attributes.PortedUrl; + CoreUrlLink.Text = attributes.PortedVersion; + CoreUrlLink.Visible = true; } }