Merge 6907 to release branch

adelikat · adelikat · commit 1a383595494e · 2014-06-21T20:22:24.000Z
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -49,6 +49,7 @@ private void MainForm_Load(object sender, EventArgs e)
 			RebootStatusBarIcon.Visible = false;
 			StatusBarDiskLightOnImage = Properties.Resources.LightOn;
 			StatusBarDiskLightOffImage = Properties.Resources.LightOff;
+			UpdateCoreStatusBarButton();
 		}
 
 		static MainForm()

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ private void MainForm_Load(object sender, EventArgs e)`
`49`	`49`	`RebootStatusBarIcon.Visible = false;`
`50`	`50`	`StatusBarDiskLightOnImage = Properties.Resources.LightOn;`
`51`	`51`	`StatusBarDiskLightOffImage = Properties.Resources.LightOff;`
	`52`	`+ UpdateCoreStatusBarButton();`
`52`	`53`	`}`
`53`	`54`
`54`	`55`	`static MainForm()`