From ab020cfad279253fd04246b9be373a737b7998d8 Mon Sep 17 00:00:00 2001 From: zeromus Date: Sat, 20 Apr 2019 14:52:32 -0400 Subject: [PATCH] fix crash disposing unavailable pipelines (was already done in GL display method but not d3d.) fixes #1546 without walls of text discussion and KBs of pointless diffs --- Bizware/BizHawk.Bizware.BizwareGL.SlimDX/IGL_SlimDX9.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/IGL_SlimDX9.cs b/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/IGL_SlimDX9.cs index b8d48b4981..912d9ba634 100644 --- a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/IGL_SlimDX9.cs +++ b/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/IGL_SlimDX9.cs @@ -520,6 +520,10 @@ namespace BizHawk.Bizware.BizwareGL.Drivers.SlimDX { var pw = pipeline.Opaque as PipelineWrapper; + //unavailable pipelines will have no opaque + if (pw == null) + return; + pw.VertexDeclaration.Dispose(); pw.FragmentShader.IGLShader.Release(); pw.VertexShader.IGLShader.Release();