Merge pull request #8122 from Pokechu22/dx11-dxgi_factory

DX11: Fix access violation on closing dolphin
dolphin-emu · May 27, 2019 · 204af41 · 204af41
2 parents f92c17e + 69d9d9f
commit 204af41
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/Source/Core/VideoBackends/D3D/D3DBase.cpp b/Source/Core/VideoBackends/D3D/D3DBase.cpp
@@ -111,7 +111,9 @@ bool Create(u32 adapter_index, bool enable_debug_layer)
   {
     PanicAlertT(
         "Failed to initialize Direct3D.\nMake sure your video card supports at least D3D 10.0");
+    dxgi_factory.Reset();
     D3DCommon::UnloadLibraries();
+    s_d3d11_library.Close();
     return false;
   }
 
@@ -155,6 +157,7 @@ void Destroy()
   else
     NOTICE_LOG(VIDEO, "Successfully released all device references!");
 
+  dxgi_factory.Reset();
   D3DCommon::UnloadLibraries();
   s_d3d11_library.Close();
 }