diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs index 43a01f3d68..0c498da501 100644 --- a/BizHawk.MultiClient/MainForm.MenuItems.cs +++ b/BizHawk.MultiClient/MainForm.MenuItems.cs @@ -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) diff --git a/BizHawk.MultiClient/RenderPanel.cs b/BizHawk.MultiClient/RenderPanel.cs index 30911db188..691d2bd3cc 100644 --- a/BizHawk.MultiClient/RenderPanel.cs +++ b/BizHawk.MultiClient/RenderPanel.cs @@ -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 { diff --git a/BizHawk.MultiClient/movie/Movie.cs b/BizHawk.MultiClient/movie/Movie.cs index 466c4016e9..6e428751bc 100644 --- a/BizHawk.MultiClient/movie/Movie.cs +++ b/BizHawk.MultiClient/movie/Movie.cs @@ -240,6 +240,7 @@ namespace BizHawk.MultiClient } } + sr.Close(); } return true;