diff --git a/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs b/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs index 93818b6998..4a4eae8dcb 100644 --- a/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs +++ b/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs @@ -29,7 +29,20 @@ namespace BizHawk.Client.Common Header[HeaderKeys.MOVIEVERSION] = "BizHawk v2.0.0"; } - public string Filename { get; set; } + private string _filename; + + public string Filename + { + get { return _filename; } + set + { + _filename = value; + int index = Filename.LastIndexOf("\\"); + Name = Filename.Substring(index + 1, Filename.Length - index - 1); + } + } + + public string Name { get; private set; } public virtual string PreferredExtension { get { return Extension; } } public const string Extension = "bk2"; diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs index 476a8eab86..d261c5569f 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs @@ -35,10 +35,10 @@ namespace BizHawk.Client.Common if (frame < LagLog.Count) { - LagLog.RemoveRange(frame, LagLog.Count - frame - 1); + LagLog.RemoveRange(frame, LagLog.Count - frame); } - StateManager.Invalidate(frame + 1); + StateManager.Invalidate(frame); if (frame < _log.Count - 1) { diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index e4728917d5..1711c756d1 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -141,6 +141,7 @@ namespace BizHawk.Client.EmuHawk WantsToControlStopMovie = false; GlobalWin.MainForm.StartNewMovie(_currentTasMovie, record: true); WantsToControlStopMovie = true; + Text = "TAStudio - " + _currentTasMovie.Name; RefreshDialog(); } } @@ -165,6 +166,7 @@ namespace BizHawk.Client.EmuHawk WantsToControlStopMovie = true; _currentTasMovie = Global.MovieSession.Movie as TasMovie; Global.Config.RecentTas.Add(path); + Text = "TAStudio - " + _currentTasMovie.Name; RefreshDialog(); } }