From 4ab2fadc9370fa62de015af2d85c1b70d29bebc1 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 4 Dec 2016 10:50:58 -0600 Subject: [PATCH] Remove an unnecessary usage of Global.Emulator in Tastudio --- BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs index d1238b9c2b..8cbfd5e8fe 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs @@ -148,7 +148,7 @@ namespace BizHawk.Client.EmuHawk // TODO: don't use Global.Emulator return new TasBranch { - Frame = Global.Emulator.Frame, + Frame = Tastudio.Emulator.Frame, CoreData = (byte[])((Global.Emulator as IStatable).SaveStateBinary().Clone()), InputLog = Movie.InputLog.Clone(), OSDFrameBuffer = GlobalWin.MainForm.CaptureOSD(),