zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-12-03 17:32:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix nullptr crash in player.camera reference when player.camera is nullptr

Browse source
This commit is contained in:
Rachael Alexanderson 2020-03-26 07:45:27 -04:00 committed by Christoph Oelckers
parent f954df7a00
commit 7c9d8a0b99
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/rendering/gl/renderer/gl_renderer.cpp
View file

@ -256,7 +256,8 @@ sector_t *FGLRenderer::RenderView(player_t* player)
NoInterpolateView = false; NoInterpolateView = false;
// Shader start time does not need to be handled per level. Just use the one from the camera to render from. // Shader start time does not need to be handled per level. Just use the one from the camera to render from.
gl_RenderState.CheckTimer(player->camera->Level->ShaderStartTime); if (player->camera)
gl_RenderState.CheckTimer(player->camera->Level->ShaderStartTime);
// prepare all camera textures that have been used in the last frame. // prepare all camera textures that have been used in the last frame.
// This must be done for all levels, not just the primary one! // This must be done for all levels, not just the primary one!
for (auto Level : AllLevels()) for (auto Level : AllLevels())

3
src/rendering/vulkan/system/vk_framebuffer.cpp
View file

@ -404,7 +404,8 @@ sector_t *VulkanFrameBuffer::RenderView(player_t *player)
NoInterpolateView = false; NoInterpolateView = false;
// Shader start time does not need to be handled per level. Just use the one from the camera to render from. // Shader start time does not need to be handled per level. Just use the one from the camera to render from.
GetRenderState()->CheckTimer(player->camera->Level->ShaderStartTime); if (player->camera)
GetRenderState()->CheckTimer(player->camera->Level->ShaderStartTime);
// prepare all camera textures that have been used in the last frame. // prepare all camera textures that have been used in the last frame.
// This must be done for all levels, not just the primary one! // This must be done for all levels, not just the primary one!
for (auto Level : AllLevels()) for (auto Level : AllLevels())