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

UpdateOverlay : Make sure the overlay is allocated before using it

This commit is contained in:
PatrickvL 2017-03-31 16:35:06 +02:00
parent 423f613822
commit 1d0e0231f5
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/CxbxKrnl/EmuD3D8.cpp
View File

@ -54,6 +54,7 @@ namespace xboxkrnl
#include "MemoryManager.h"
#include "EmuXTL.h"
#include <assert.h>
#include <process.h>
#include <clocale>
@ -372,7 +373,7 @@ VOID CxbxReleaseBackBufferLock()
if (D3D_OK == g_pD3DDevice8->GetBackBuffer(0, XTL::D3DBACKBUFFER_TYPE_MONO, &pBackBuffer))
{
// TODO : assert(pBackBuffer != nullptr);
assert(pBackBuffer != nullptr);
pBackBuffer->UnlockRect();
pBackBuffer->Release();
@ -6047,6 +6048,12 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_UpdateOverlay)
if(g_bSupportsYUY2)
{
DDSURFACEDESC2 ddsd2;
// Make sure the overlay is allocated before using it
if (g_pDDSOverlay7 == nullptr) {
EMUPATCH(D3DDevice_EnableOverlay)(TRUE);
assert(g_pDDSOverlay7 != nullptr);
}
ZeroMemory(&ddsd2, sizeof(ddsd2));
ddsd2.dwSize = sizeof(ddsd2);