From 69a84a27820ae77e5682ae840f0145abc8355f37 Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Thu, 7 Apr 2016 18:17:11 +0100 Subject: [PATCH] gsdx:windows: Don't call GSshutdown in GSconfigure Fixes an issue with the D3D backends crashing if the configure dialog is accessed and ok is pressed. The D3Dcompiler dll is freed and a null pointer is dereferenced. It might break gsdxgui but GSshutdown really should not be called unless GSdx is shutting down. GSDumpGUI on Windows provides the same (or better) functionality. --- plugins/GSdx/GS.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/plugins/GSdx/GS.cpp b/plugins/GSdx/GS.cpp index d3579fbff5..0eecf951b8 100644 --- a/plugins/GSdx/GS.cpp +++ b/plugins/GSdx/GS.cpp @@ -811,12 +811,6 @@ EXPORT_C GSconfigure() GSDialog::InitCommonControls(); if(GSSettingsDlg().DoModal() == IDOK) { - if(s_gs != NULL && s_gs->m_wnd->IsManaged()) - { - // Legacy apps like gsdxgui expect this... - - GSshutdown(); - } // Force a reload of the gs state s_renderer = GSRendererType::Undefined; }