ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't call _Register on resources with no Data pointer

This commit is contained in:
Luke Usher 2018-01-29 21:57:53 +00:00
parent 00dae2954f
commit 0e4b623fc2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CxbxKrnl/EmuD3D8.cpp
View File

@ -698,7 +698,7 @@ resource_key_t GetHostResourceKey(XTL::X_D3DResource* pXboxResource)
return (resource_key_t)(((uint64_t)pXboxResource->Data << 32) | (DWORD)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 // Cleanup RegisteredResources array
auto registeredResourceIterator = std::find(g_RegisteredResources.begin(), g_RegisteredResources.end(), key); 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) XTL::IDirect3DResource8 *GetHostResource(XTL::X_D3DResource *pXboxResource, bool shouldRegister = true)
{ {
if (pXboxResource == NULL) if (pXboxResource == NULL || pXboxResource->Data == NULL)
return nullptr; return nullptr;
if (shouldRegister) { if (shouldRegister) {