From 0e4b623fc220cfa5d18bb279cca8b7fb551896a2 Mon Sep 17 00:00:00 2001 From: Luke Usher Date: Mon, 29 Jan 2018 21:57:53 +0000 Subject: [PATCH] Don't call _Register on resources with no Data pointer --- src/CxbxKrnl/EmuD3D8.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CxbxKrnl/EmuD3D8.cpp b/src/CxbxKrnl/EmuD3D8.cpp index f73281cf0..d23f1a68a 100755 --- a/src/CxbxKrnl/EmuD3D8.cpp +++ b/src/CxbxKrnl/EmuD3D8.cpp @@ -698,7 +698,7 @@ resource_key_t GetHostResourceKey(XTL::X_D3DResource* pXboxResource) return (resource_key_t)(((uint64_t)pXboxResource->Data << 32) | (DWORD)pXboxResource); } -bool FreeHostResource(resource_key_t key) +void FreeHostResource(resource_key_t key) { // Cleanup RegisteredResources array auto registeredResourceIterator = std::find(g_RegisteredResources.begin(), g_RegisteredResources.end(), key); @@ -719,7 +719,7 @@ bool FreeHostResource(resource_key_t key) XTL::IDirect3DResource8 *GetHostResource(XTL::X_D3DResource *pXboxResource, bool shouldRegister = true) { - if (pXboxResource == NULL) + if (pXboxResource == NULL || pXboxResource->Data == NULL) return nullptr; if (shouldRegister) {