diff --git a/BizHawk.MultiClient/RenderPanel.cs b/BizHawk.MultiClient/RenderPanel.cs index 691d2bd3cc..3844e5b966 100644 --- a/BizHawk.MultiClient/RenderPanel.cs +++ b/BizHawk.MultiClient/RenderPanel.cs @@ -303,12 +303,16 @@ namespace BizHawk.MultiClient private string MakeFrameCounter() { + //TODO: remove rerecord count code and make it its own display option if (Global.MainForm.UserMovie.GetMovieMode() == MOVIEMODE.PLAY) { - return Global.Emulator.Frame.ToString() + " " + Global.MainForm.UserMovie.lastLog.ToString() - + "/" + Global.MainForm.UserMovie.GetMovieLength().ToString(); + return Global.Emulator.Frame.ToString() + " " + Global.MainForm.UserMovie.lastLog.ToString() + + "/" + Global.MainForm.UserMovie.GetMovieLength().ToString() + " Rerecord count: " + Global.MainForm.UserMovie.GetRerecordCount(); } - else + else if (Global.MainForm.UserMovie.GetMovieMode() != MOVIEMODE.INACTIVE) + return Global.Emulator.Frame.ToString() + " " + Global.MainForm.UserMovie.lastLog.ToString() + + "/" + Global.MainForm.UserMovie.GetMovieLength().ToString() + " Rerecord count: " + Global.MainForm.UserMovie.GetRerecordCount(); + else { return Global.Emulator.Frame.ToString(); } diff --git a/BizHawk.MultiClient/movie/Movie.cs b/BizHawk.MultiClient/movie/Movie.cs index a0dcf57faa..fbbddf1dad 100644 --- a/BizHawk.MultiClient/movie/Movie.cs +++ b/BizHawk.MultiClient/movie/Movie.cs @@ -314,5 +314,10 @@ namespace BizHawk.MultiClient rerecordCount++; Header.UpdateRerecordCount(rerecordCount); } + + public int GetRerecordCount() + { + return rerecordCount; + } } }