From 136c2b22110049d721a23e02e60169f6f04fed76 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Sat, 29 May 2021 07:59:49 -0400 Subject: [PATCH] Shutdown fix --- BeefySysLib/platform/win/DXRenderDevice.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BeefySysLib/platform/win/DXRenderDevice.cpp b/BeefySysLib/platform/win/DXRenderDevice.cpp index 4bc3bf56..9eeadcb9 100644 --- a/BeefySysLib/platform/win/DXRenderDevice.cpp +++ b/BeefySysLib/platform/win/DXRenderDevice.cpp @@ -254,7 +254,7 @@ DXTexture::DXTexture() DXTexture::~DXTexture() { - if (!mPath.IsEmpty()) + if ((!mPath.IsEmpty()) && (mRenderDevice != NULL)) ((DXRenderDevice*)mRenderDevice)->mTextureMap.Remove(mPath); //OutputDebugStrF("DXTexture::~DXTexture %@\n", this); @@ -1486,6 +1486,9 @@ DXRenderDevice::DXRenderDevice() DXRenderDevice::~DXRenderDevice() { + for (auto& kv : mTextureMap) + kv.mValue->mRenderDevice = NULL; + mD3DVertexBuffer->Release(); mD3DIndexBuffer->Release(); delete mDefaultRenderState;