Merge pull request #827 from shanehoman/saveram_hotkey_lua

flush Saveram via hotkey or lua

BizHawk.Client.Common/config/Binding.cs

@@ -132,6 +132,7 @@ namespace BizHawk.Client.Common
 						Bind("General", "Open ROM", "Ctrl+O"),
 						Bind("General", "Close ROM", "Ctrl+W"),
 						Bind("General", "Load Last ROM"),
+						Bind("General", "Flush SRAM", "Ctrl+S"),
 						Bind("General", "Display FPS"),
 						Bind("General", "Frame Counter"),
 						Bind("General", "Lag Counter"),

BizHawk.Client.EmuHawk/MainForm.Designer.cs

@@ -894,6 +894,7 @@
 			this.SaveRAMSubMenu.Name = "SaveRAMSubMenu";
 			this.SaveRAMSubMenu.Size = new System.Drawing.Size(159, 22);
 			this.SaveRAMSubMenu.Text = "Save &RAM";
+			this.SaveRAMSubMenu.DropDownOpened += new System.EventHandler(this.SaveRAMSubMenu_DropDownOpened);
 			// 
 			// FlushSaveRAMMenuItem
 			// 

BizHawk.Client.EmuHawk/MainForm.Events.cs

@@ -2178,6 +2178,11 @@ namespace BizHawk.Client.EmuHawk
 			SaveRam();
 		}
 
+		private void SaveRAMSubMenu_DropDownOpened(object sender, EventArgs e)
+		{
+			this.FlushSaveRAMMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Save SRAM"].Bindings;
+		}
+
 		#endregion
 
 		#region Coleco

BizHawk.Client.EmuHawk/MainForm.Hotkey.cs

@@ -63,6 +63,9 @@ namespace BizHawk.Client.EmuHawk
 				case "Load Last ROM":
 					LoadRomFromRecent(Global.Config.RecentRoms.MostRecent);
 					break;
+				case "Flush SRAM":
+					SaveRam();
+					break;
 				case "Display FPS":
 					ToggleFPS();
 					break;

BizHawk.Client.EmuHawk/MainForm.cs

@@ -1592,7 +1592,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private void SaveRam()
+		public void SaveRam()
 		{
 			if (Emulator.HasSaveRam())
 			{

BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs

@@ -533,5 +533,14 @@ namespace BizHawk.Client.EmuHawk
 		{
 			Global.Config.DisplayMessages = value;
 		}
+
+		[LuaMethodAttributes(
+			"saveram",
+			"flushes save ram to disk"
+			)]
+		public void SaveRam()
+		{
+			GlobalWin.MainForm.SaveRam();
+		}
 	}
 }