From a858282a8d4119e48b9aae60e7d85b0b4f2e852d Mon Sep 17 00:00:00 2001
From: Morilli <35152647+Morilli@users.noreply.github.com>
Date: Tue, 8 Feb 2022 19:46:27 +0100
Subject: [PATCH] Fix #1513 hopefully properly

---
 .../DisplayManager/DisplayManagerBase.cs      | 26 ++-----------------
 src/BizHawk.Client.EmuHawk/MainForm.cs        |  2 +-
 2 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/src/BizHawk.Client.Common/DisplayManager/DisplayManagerBase.cs b/src/BizHawk.Client.Common/DisplayManager/DisplayManagerBase.cs
index 05700ae37e..d1b131184b 100644
--- a/src/BizHawk.Client.Common/DisplayManager/DisplayManagerBase.cs
+++ b/src/BizHawk.Client.Common/DisplayManager/DisplayManagerBase.cs
@@ -498,27 +498,6 @@ namespace BizHawk.Client.Common
 			return null;
 		}
 
-		public BitmapBuffer RenderVideoProvider(IVideoProvider videoProvider)
-		{
-			// TODO - we might need to gather more Config.DispXXX properties here, so they can be overridden
-			var targetSize = new Size(videoProvider.BufferWidth, videoProvider.BufferHeight);
-			var padding = CalculateCompleteContentPaddingSum(true,true);
-			targetSize.Width += padding.Horizontal;
-			targetSize.Height += padding.Vertical;
-
-			var job = new JobInfo
-			{
-				VideoProvider = videoProvider,
-				Simulate = false,
-				ChainOutsize = targetSize,
-				Offscreen = true,
-				IncludeOSD = false,
-				IncludeUserFilters = false
-			};
-			UpdateSourceInternal(job);
-			return job.OffscreenBb;
-		}
-
 		/// <summary>
 		/// Does the entire display process to an offscreen buffer, suitable for a 'client' screenshot.
 		/// </summary>
@@ -910,8 +889,7 @@ namespace BizHawk.Client.Common
 			}
 
 			//POOPY. why are we delivering the GL context this way? such bad
-			ScreenControlNDS fNDS = filterProgram["CoreScreenControl"] as ScreenControlNDS;
-			if (fNDS != null)
+			if (filterProgram["CoreScreenControl"] is ScreenControlNDS fNDS)
 			{
 				fNDS.GuiRenderer = _renderer;
 				fNDS.GL = _gl;
@@ -1108,4 +1086,4 @@ namespace BizHawk.Client.Common
 			public Rectangle ClipBounds { get; set; }
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index cc1cc0fd22..dda9d945b0 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -2287,7 +2287,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public BitmapBuffer MakeScreenshotImage()
 		{
-			return DisplayManager.RenderVideoProvider(_currentVideoProvider);
+			return new BitmapBuffer(_currentVideoProvider.BufferWidth, _currentVideoProvider.BufferHeight, _currentVideoProvider.GetVideoBuffer().ToArray());
 		}
 
 		private void SaveSlotSelectedMessage()