From b594360a25c93a63c8f318deb7f631f55515b2b7 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@expion.com>
Date: Sun, 12 Jul 2015 10:58:13 -0400
Subject: [PATCH] We had two variables controlling the state of the visibility
 of the windowed status bar, remove one of them. Fixes issue #448

---
 BizHawk.Client.Common/config/Config.cs    | 1 -
 BizHawk.Client.EmuHawk/MainForm.Events.cs | 6 +++---
 BizHawk.Client.EmuHawk/MainForm.cs        | 9 +--------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/BizHawk.Client.Common/config/Config.cs b/BizHawk.Client.Common/config/Config.cs
index 0e7b896a6d..e2f0e50787 100644
--- a/BizHawk.Client.Common/config/Config.cs
+++ b/BizHawk.Client.Common/config/Config.cs
@@ -215,7 +215,6 @@ namespace BizHawk.Client.Common
 		public bool DisplayLagCounter = false;
 		public bool DisplayInput = false;
 		public bool DisplayRerecordCount = false;
-        public bool DisplayStatusBar = true;
 
         public bool DispBlurry = false; // make display look ugly
         public bool DispFixAspectRatio = true;
diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index b4543fdf3b..c66f54e198 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -667,7 +667,7 @@ namespace BizHawk.Client.EmuHawk
 			DisplayInputMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Input Display"].Bindings;
 			SwitchToFullscreenMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Full Screen"].Bindings;
 
-			DisplayStatusBarMenuItem.Checked = Global.Config.DisplayStatusBar;
+			DisplayStatusBarMenuItem.Checked = Global.Config.DispChrome_StatusBarWindowed;
 			DisplayLogWindowMenuItem.Checked = Global.Config.ShowLogWindow;
 
 			DisplayLagCounterMenuItem.Enabled = Global.Emulator.CanPollInput();
@@ -747,7 +747,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void DisplayStatusBarMenuItem_Click(object sender, EventArgs e)
 		{
-			Global.Config.DisplayStatusBar ^= true;
+			Global.Config.DispChrome_StatusBarWindowed ^= true;
 			SetStatusBar();
 		}
 
@@ -755,7 +755,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (!_inFullscreen)
 			{
-				MainStatusBar.Visible = Global.Config.DisplayStatusBar;
+				MainStatusBar.Visible = Global.Config.DispChrome_StatusBarWindowed;
 				PerformLayout();
 				FrameBufferResized();
 			}
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 8548549524..b76d82aa42 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -393,14 +393,7 @@ namespace BizHawk.Client.EmuHawk
 				GlobalWin.Tools.Load<Cheats>();
 			}
 
-			if (Global.Config.DisplayStatusBar == false)
-			{
-				MainStatusBar.Visible = false;
-			}
-			else
-			{
-				DisplayStatusBarMenuItem.Checked = true;
-			}
+			SetStatusBar();
 
 			if (Global.Config.StartPaused)
 			{