TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed a crash bug with a null pointer

Browse Source
This commit is contained in:
Asad M. Zaman 2004-03-19 17:30:17 +00:00
parent 553b9c6b20
commit 1ed5d5c0e3
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
panda/src/dxgsg8/dxGraphicsStateGuardian8.cxx
View File

@ -4855,6 +4855,7 @@ reset_d3d_device(D3DPRESENT_PARAMETERS *pPresParams, DXScreenData **pScrn) {
get_engine()->reset_all_windows(true);// reset with new swapchains by creating get_engine()->reset_all_windows(true);// reset with new swapchains by creating
if (pScrn)
*pScrn = NULL; *pScrn = NULL;
if(pPresParams!=&_pScrn->PresParams) if(pPresParams!=&_pScrn->PresParams)
memcpy(&_pScrn->PresParams,pPresParams,sizeof(D3DPRESENT_PARAMETERS)); memcpy(&_pScrn->PresParams,pPresParams,sizeof(D3DPRESENT_PARAMETERS));
@ -4862,7 +4863,7 @@ reset_d3d_device(D3DPRESENT_PARAMETERS *pPresParams, DXScreenData **pScrn) {
} }
// release the old swapchain and create a new one // release the old swapchain and create a new one
if (_pScrn->pSwapChain) { if (_pScrn && _pScrn->pSwapChain) {
_pScrn->pSwapChain->Release(); _pScrn->pSwapChain->Release();
wdxdisplay8_cat.debug() << "SwapChain " << _pScrn->pSwapChain << " is released\n"; wdxdisplay8_cat.debug() << "SwapChain " << _pScrn->pSwapChain << " is released\n";
_pScrn->pSwapChain = NULL; _pScrn->pSwapChain = NULL;

3
panda/src/dxgsg9/dxGraphicsStateGuardian9.cxx
View File

@ -4855,6 +4855,7 @@ reset_d3d_device(D3DPRESENT_PARAMETERS *pPresParams, DXScreenData **pScrn) {
get_engine()->reset_all_windows(true);// reset with new swapchains by creating get_engine()->reset_all_windows(true);// reset with new swapchains by creating
if (pScrn)
*pScrn = NULL; *pScrn = NULL;
if(pPresParams!=&_pScrn->PresParams) if(pPresParams!=&_pScrn->PresParams)
memcpy(&_pScrn->PresParams,pPresParams,sizeof(D3DPRESENT_PARAMETERS)); memcpy(&_pScrn->PresParams,pPresParams,sizeof(D3DPRESENT_PARAMETERS));
@ -4862,7 +4863,7 @@ reset_d3d_device(D3DPRESENT_PARAMETERS *pPresParams, DXScreenData **pScrn) {
} }
// release the old swapchain and create a new one // release the old swapchain and create a new one
if (_pScrn->pSwapChain) { if (_pScrn && _pScrn->pSwapChain) {
_pScrn->pSwapChain->Release(); _pScrn->pSwapChain->Release();
wdxdisplay9_cat.debug() << "SwapChain " << _pScrn->pSwapChain << " is released\n"; wdxdisplay9_cat.debug() << "SwapChain " << _pScrn->pSwapChain << " is released\n";
_pScrn->pSwapChain = NULL; _pScrn->pSwapChain = NULL;