Fixes to movie code

This commit is contained in:
andres.delikat 2011-05-12 01:33:51 +00:00
parent 7d135a5d62
commit 477999f99d
3 changed files with 3 additions and 4 deletions

View File

@ -128,8 +128,6 @@ namespace BizHawk.MultiClient
{
PlayMovie p = new PlayMovie();
DialogResult d = p.ShowDialog();
if (d == DialogResult.OK)
LoadRom(CurrentlyOpenRom);
}
private void stopMovieToolStripMenuItem_Click(object sender, EventArgs e)

View File

@ -305,8 +305,8 @@ namespace BizHawk.MultiClient
{
if (Global.MainForm.UserMovie.GetMovieMode() == MOVIEMODE.PLAY)
{
return Global.Emulator.Frame.ToString() + " " + Global.MainForm.InputLog.lastLog.ToString()
+ "/" + Global.MainForm.InputLog.GetMovieLength().ToString();
return Global.Emulator.Frame.ToString() + " " + Global.MainForm.UserMovie.lastLog.ToString()
+ "/" + Global.MainForm.UserMovie.GetMovieLength().ToString();
}
else
{

View File

@ -240,6 +240,7 @@ namespace BizHawk.MultiClient
}
}
sr.Close();
}
return true;