From a0352a029f30284f870a0d2ef674e2c4a405977c Mon Sep 17 00:00:00 2001 From: Volkan Date: Fri, 7 Aug 2020 00:55:40 -0700 Subject: [PATCH] Fix deadlock during exit --- Source/Application/VQEngine_Main.cpp | 3 +++ Source/Application/VQEngine_Render.cpp | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/Application/VQEngine_Main.cpp b/Source/Application/VQEngine_Main.cpp index cd459458..53f6ed06 100644 --- a/Source/Application/VQEngine_Main.cpp +++ b/Source/Application/VQEngine_Main.cpp @@ -133,6 +133,9 @@ bool VQEngine::Initialize(const FStartupParameters& Params) void VQEngine::Exit() { ExitThreads(); + + mRenderer.Unload(); + mRenderer.Exit(); } diff --git a/Source/Application/VQEngine_Render.cpp b/Source/Application/VQEngine_Render.cpp index 05c07dee..fccd8d5d 100644 --- a/Source/Application/VQEngine_Render.cpp +++ b/Source/Application/VQEngine_Render.cpp @@ -172,8 +172,7 @@ void VQEngine::RenderThread_Inititalize() void VQEngine::RenderThread_Exit() { - mRenderer.Unload(); - mRenderer.Exit(); + mpSemUpdate->Signal(); } void VQEngine::InitializeBuiltinMeshes()