From d91e3b9dcb205a408710e9f1d8471642b23a9d44 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Tue, 13 Jun 2017 08:24:37 -0500
Subject: [PATCH] Fix oopsies from merge, update SNESOptions ui to account for
 the Crop SGB option

---
 .../config/GenericCoreConfig.cs               |  4 +--
 .../config/SNES/SNESOptions.Designer.cs       | 14 ++++----
 .../config/SNES/SNESOptions.cs                | 35 -------------------
 3 files changed, 9 insertions(+), 44 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/config/GenericCoreConfig.cs b/BizHawk.Client.EmuHawk/config/GenericCoreConfig.cs
index 69970115e5..d8c19d9644 100644
--- a/BizHawk.Client.EmuHawk/config/GenericCoreConfig.cs
+++ b/BizHawk.Client.EmuHawk/config/GenericCoreConfig.cs
@@ -59,9 +59,9 @@ namespace BizHawk.Client.EmuHawk
 
 		private void OkBtn_Click(object sender, EventArgs e)
 		{
-			if (s != null && settingschanged)
+			if (_s != null && settingschanged)
 			{
-				GlobalWin.MainForm.PutCoreSettings(s);
+				GlobalWin.MainForm.PutCoreSettings(_s);
 			}
 
 			if (_ss != null && _syncsettingschanged)
diff --git a/BizHawk.Client.EmuHawk/config/SNES/SNESOptions.Designer.cs b/BizHawk.Client.EmuHawk/config/SNES/SNESOptions.Designer.cs
index 7410f0d456..4599d4ae7c 100644
--- a/BizHawk.Client.EmuHawk/config/SNES/SNESOptions.Designer.cs
+++ b/BizHawk.Client.EmuHawk/config/SNES/SNESOptions.Designer.cs
@@ -28,19 +28,18 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
-<<<<<<< HEAD
             this.btnOk = new System.Windows.Forms.Button();
             this.btnCancel = new System.Windows.Forms.Button();
             this.cbDoubleSize = new System.Windows.Forms.CheckBox();
             this.lblDoubleSize = new System.Windows.Forms.Label();
             this.radioButton1 = new System.Windows.Forms.RadioButton();
-			this.cbCropSGBFrame = new System.Windows.Forms.CheckBox();
+            this.cbCropSGBFrame = new System.Windows.Forms.CheckBox();
             this.SuspendLayout();
             // 
             // btnOk
             // 
             this.btnOk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnOk.Location = new System.Drawing.Point(136, 117);
+            this.btnOk.Location = new System.Drawing.Point(136, 141);
             this.btnOk.Name = "btnOk";
             this.btnOk.Size = new System.Drawing.Size(75, 23);
             this.btnOk.TabIndex = 0;
@@ -52,7 +51,7 @@
             // 
             this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.btnCancel.Location = new System.Drawing.Point(217, 117);
+            this.btnCancel.Location = new System.Drawing.Point(217, 141);
             this.btnCancel.Name = "btnCancel";
             this.btnCancel.Size = new System.Drawing.Size(75, 23);
             this.btnCancel.TabIndex = 1;
@@ -95,7 +94,7 @@
             // cbCropSGBFrame
             // 
             this.cbCropSGBFrame.AutoSize = true;
-            this.cbCropSGBFrame.Location = new System.Drawing.Point(15, 211);
+            this.cbCropSGBFrame.Location = new System.Drawing.Point(15, 110);
             this.cbCropSGBFrame.Name = "cbCropSGBFrame";
             this.cbCropSGBFrame.Size = new System.Drawing.Size(105, 17);
             this.cbCropSGBFrame.TabIndex = 10;
@@ -108,8 +107,8 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.btnCancel;
-            this.ClientSize = new System.Drawing.Size(304, 152);
-            this.Controls.Add(this.cbCropSGBFrame)
+            this.ClientSize = new System.Drawing.Size(304, 176);
+            this.Controls.Add(this.cbCropSGBFrame);
             this.Controls.Add(this.lblDoubleSize);
             this.Controls.Add(this.cbDoubleSize);
             this.Controls.Add(this.btnCancel);
@@ -123,6 +122,7 @@
             this.Text = "SNES Options";
             this.ResumeLayout(false);
             this.PerformLayout();
+
 		}
 
 		#endregion
diff --git a/BizHawk.Client.EmuHawk/config/SNES/SNESOptions.cs b/BizHawk.Client.EmuHawk/config/SNES/SNESOptions.cs
index 9f36f4796b..23ce98d838 100644
--- a/BizHawk.Client.EmuHawk/config/SNES/SNESOptions.cs
+++ b/BizHawk.Client.EmuHawk/config/SNES/SNESOptions.cs
@@ -36,41 +36,6 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private void SNESOptions_Load(object sender, EventArgs e)
-		{
-			rbAccuracy.Visible = label2.Visible = VersionInfo.DeveloperBuild;
-		}
-
-		private string Profile
-		{
-			get
-			{
-				if (rbCompatibility.Checked)
-				{
-					return "Compatibility";
-				}
-
-				if (rbPerformance.Checked)
-				{
-					return "Performance";
-				}
-
-				if (rbAccuracy.Checked)
-				{
-					return "Accuracy";
-				}
-
-				throw new InvalidOperationException();
-			}
-
-			set
-			{
-				rbCompatibility.Checked = value == "Compatibility";
-				rbPerformance.Checked = value == "Performance";
-				rbAccuracy.Checked = value == "Accuracy";
-			}
-		}
-
 		private bool AlwaysDoubleSize
 		{
 			get