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

fix potential crash when running the software renderer (oops)

This commit is contained in:
Arisotura 2019-06-02 14:57:59 +02:00
parent 3aa971403b
commit 6de19645f8
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
melonDS.cbp
View File

@ -143,6 +143,8 @@
<Unit filename="src/libui_sdl/LAN_PCap.h" /> <Unit filename="src/libui_sdl/LAN_PCap.h" />
<Unit filename="src/libui_sdl/LAN_Socket.cpp" /> <Unit filename="src/libui_sdl/LAN_Socket.cpp" />
<Unit filename="src/libui_sdl/LAN_Socket.h" /> <Unit filename="src/libui_sdl/LAN_Socket.h" />
<Unit filename="src/libui_sdl/OSD.cpp" />
<Unit filename="src/libui_sdl/OSD.h" />
<Unit filename="src/libui_sdl/Platform.cpp" /> <Unit filename="src/libui_sdl/Platform.cpp" />
<Unit filename="src/libui_sdl/PlatformConfig.cpp" /> <Unit filename="src/libui_sdl/PlatformConfig.cpp" />
<Unit filename="src/libui_sdl/PlatformConfig.h" /> <Unit filename="src/libui_sdl/PlatformConfig.h" />

8
src/GPU2D.cpp
View File

@ -882,10 +882,12 @@ void GPU2D::VBlankEnd()
OBJMosaicY = 0; OBJMosaicY = 0;
OBJMosaicYMax = OBJMosaicSize[1]; OBJMosaicYMax = OBJMosaicSize[1];
// TODO: make optional if (GPU3D::Renderer != 0)
if ((Num == 0) && (CaptureCnt & (1<<31)) && (((CaptureCnt >> 29) & 0x3) != 1))
{ {
GPU3D::GLRenderer::PrepareCaptureFrame(); if ((Num == 0) && (CaptureCnt & (1<<31)) && (((CaptureCnt >> 29) & 0x3) != 1))
{
GPU3D::GLRenderer::PrepareCaptureFrame();
}
} }
} }