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

…nullptr
ZDoom · Mar 26, 2020 · 7c9d8a0 · 7c9d8a0
1 parent f954df7
commit 7c9d8a0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/rendering/gl/renderer/gl_renderer.cpp b/src/rendering/gl/renderer/gl_renderer.cpp
@@ -256,7 +256,8 @@ sector_t *FGLRenderer::RenderView(player_t* player)
 		NoInterpolateView = false;
 
 		// 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.
 		// This must be done for all levels, not just the primary one!
 		for (auto Level : AllLevels())

diff --git a/src/rendering/vulkan/system/vk_framebuffer.cpp b/src/rendering/vulkan/system/vk_framebuffer.cpp
@@ -404,7 +404,8 @@ sector_t *VulkanFrameBuffer::RenderView(player_t *player)
 		NoInterpolateView = false;
 
 		// 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.
 		// This must be done for all levels, not just the primary one!
 		for (auto Level : AllLevels())