From cf8f2628c052a3d5f2dbca1364bc14f1791e74d1 Mon Sep 17 00:00:00 2001 From: medievil1 <38597905+medievil1@users.noreply.github.com> Date: Fri, 23 Apr 2021 17:20:11 -0400 Subject: [PATCH] check for null device Check to make sure device is null before creating it, avoids losing device due to unneeded recreation --- src/core/hle/D3D8/Direct3D9/Direct3D9.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp b/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp index 0fb8cf99c..83e866326 100644 --- a/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp +++ b/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp @@ -3028,6 +3028,11 @@ void Direct3D_CreateDevice_Start // create default device *before* calling Xbox Direct3D_CreateDevice trampoline // to avoid hitting EMUPATCH'es that need a valid g_pD3DDevice + + if (g_pD3DDevice != nullptr) { // Check to make sure device is null, otherwise no need to create it + return; + } + CreateDefaultD3D9Device(pPresentationParameters); }