diff --git a/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs b/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs index 391d5ab273..854a9697ad 100644 --- a/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs +++ b/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs @@ -743,7 +743,9 @@ namespace BizHawk.Client.EmuHawk return (index >= FirstVisibleRow) && (index <= LastFullyVisibleRow); } public bool IsPartiallyVisible(int index) - { return (index >= FirstVisibleRow) && (index <= LastVisibleRow); } + { + return (index >= FirstVisibleRow) && (index <= LastVisibleRow); + } /// /// Gets the number of rows currently visible including partially visible rows. diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs index 5734ec4357..9379ade84a 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs @@ -145,7 +145,7 @@ namespace BizHawk.Client.EmuHawk if (SelectedBranch != null) { int index = BranchView.SelectedRows.First(); - //if (Movie.CurrentBranchCurrentBranch == index) // if the current branch was edited, we should allow loading it. some day there might be a proper check + //if (Movie.CurrentBranch == index) // if the current branch was edited, we should allow loading it. some day there might be a proper check // return; Movie.CurrentBranch = index; LoadBranch(SelectedBranch); diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs index 47f449623f..4eb586e791 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs @@ -39,14 +39,15 @@ namespace BizHawk.Client.EmuHawk if (AutoadjustInputMenuItem.Checked) refreshNeeded = AutoAdjustInput(); + if (TasView.RowCount != CurrentTasMovie.InputLogLength + 1) + TasView.RowCount = CurrentTasMovie.InputLogLength + 1; + MaybeFollowCursor(); if (TasView.IsPartiallyVisible(Global.Emulator.Frame) || TasView.IsPartiallyVisible(lastRefresh)) refreshNeeded = true; RefreshDialog(refreshNeeded); - if (!refreshNeeded && TasView.RowCount != CurrentTasMovie.InputLogLength + 1) // Perhaps not the best place to put this. - TasView.RowCount = CurrentTasMovie.InputLogLength + 1; } public void FastUpdate()