From 8bbc2c75d01a09a63b0735e49b12514eac86df36 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 24 Nov 2019 14:41:03 -0600 Subject: [PATCH] lua - tastudio.loadbranch - use the already existing (and better) load branch method --- .../tools/TAStudio/BookmarksBranchesBox.cs | 2 +- BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs index 2c49574ac1..cf5398c62e 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs @@ -191,7 +191,7 @@ namespace BizHawk.Client.EmuHawk }; } - public void LoadBranch(TasBranch branch) + private void LoadBranch(TasBranch branch) { if (Tastudio.Settings.OldControlSchemeForBranches && !Tastudio.TasPlaybackBox.RecordingMode) { diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index 7b3807f193..343907aea0 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -140,11 +140,7 @@ namespace BizHawk.Client.EmuHawk public void LoadBranchByIndex(int index) { - if (index < CurrentTasMovie.BranchCount) - { - var branch = CurrentTasMovie.Branches[index]; - BookMarkControl.LoadBranch(branch); - } + BookMarkControl.LoadBranchExternal(index); } private void AutosaveTimerEventProcessor(object sender, EventArgs e)