ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix typo that caused loadstate hotkey mapping to display on load config menu item, fix so that movie log loading from savestate doesn't crash if text line is null

This commit is contained in:
andres.delikat 2011-05-23 02:15:16 +00:00
parent 157d8b7152
commit 4a28b282f8
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.MultiClient/MainForm.MenuItems.cs
View File

@ -514,7 +514,7 @@ namespace BizHawk.MultiClient
previousSlotToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.PreviousSlot;
nextSlotToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.NextSlot;
saveToCurrentSlotToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.QuickSave;
loadConfigToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.QuickLoad;
loadCurrentSlotToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.QuickLoad;
}
private void switchToFullscreenToolStripMenuItem_Click(object sender, EventArgs e)

1
BizHawk.MultiClient/movie/Movie.cs
View File

@ -333,6 +333,7 @@ namespace BizHawk.MultiClient
while (true)
{
string line = reader.ReadLine();
if (line == null) break;
if (line.Trim() == "") continue;
if (line == "[Input]") continue;
if (line == "[/Input]") break;