From f1775ee64b6adf883ff96fef8f539249907278cf Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Tue, 14 Jun 2022 01:29:37 +0200 Subject: [PATCH] Fix null pointer crash if shader fails to compile during startup --- .../rendering/vulkan/system/vk_framebuffer.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/common/rendering/vulkan/system/vk_framebuffer.cpp b/src/common/rendering/vulkan/system/vk_framebuffer.cpp index 3a2a4561561..19f16f93204 100644 --- a/src/common/rendering/vulkan/system/vk_framebuffer.cpp +++ b/src/common/rendering/vulkan/system/vk_framebuffer.cpp @@ -98,10 +98,14 @@ VulkanFrameBuffer::~VulkanFrameBuffer() delete mLights; mShadowMap.Reset(); - mDescriptorSetManager->Deinit(); - mTextureManager->Deinit(); - mBufferManager->Deinit(); - mShaderManager->Deinit(); + if (mDescriptorSetManager) + mDescriptorSetManager->Deinit(); + if (mTextureManager) + mTextureManager->Deinit(); + if (mBufferManager) + mBufferManager->Deinit(); + if (mShaderManager) + mShaderManager->Deinit(); mCommands->DeleteFrameObjects(); }