From dca259fff20528f659f5d953bd2a46ba0a38ffca Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@expion.com>
Date: Tue, 21 Jul 2015 20:31:51 -0400
Subject: [PATCH] Tastudio branches - progress on loading the frame buffer when
 loading a branch

---
 BizHawk.Client.Common/QuickBmpFile.cs                         | 4 ++--
 BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/BizHawk.Client.Common/QuickBmpFile.cs b/BizHawk.Client.Common/QuickBmpFile.cs
index 24bb9ce772..c92457a5f8 100644
--- a/BizHawk.Client.Common/QuickBmpFile.cs
+++ b/BizHawk.Client.Common/QuickBmpFile.cs
@@ -156,8 +156,8 @@ namespace BizHawk.Client.Common
 				new BMP
 				{
 					Data = dstp,
-					Width = src.BufferWidth,
-					Height = src.BufferHeight
+					Width = dst.BufferWidth,
+					Height = dst.BufferHeight
 				});
 			}
 		}
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
index 1bfdf6a6a7..7903672734 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
@@ -130,6 +130,8 @@ namespace BizHawk.Client.EmuHawk
 			Tastudio.LoadState(stateInfo);
 			//SavestateManager.PopulateFramebuffer(branch.OSDFrameBuffer);
 			//Temp(branch.OSDFrameBuffer);
+			QuickBmpFile.Copy(new BitmapBufferVideoProvider(branch.OSDFrameBuffer), Global.Emulator.VideoProvider());
+
 			GlobalWin.MainForm.PauseEmulator();
 			GlobalWin.MainForm.PauseOnFrame = null;
 			Tastudio.RefreshDialog();