From 0be1f8d48d67d3219f030fdef655efd6bc3bc73e Mon Sep 17 00:00:00 2001 From: Ylva Selling Date: Mon, 8 Mar 2021 16:29:33 +0100 Subject: [PATCH] Add check for joining thread so it is joinable --- modules/skybrowser/skybrowsermodule.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/skybrowser/skybrowsermodule.cpp b/modules/skybrowser/skybrowsermodule.cpp index f79b0280f3..a19b6bff89 100644 --- a/modules/skybrowser/skybrowsermodule.cpp +++ b/modules/skybrowser/skybrowsermodule.cpp @@ -90,11 +90,13 @@ SkyBrowserModule::SkyBrowserModule() } void SkyBrowserModule::internalDeinitialize() { - ZoneScoped - // Set flag to false so the thread can exit + // Set flag to false so the thread can exit _camIsSyncedWWT = false; - _thread.join(); - LINFO("Joined thread"); + if (_thread.joinable()) { + _thread.join(); + LINFO("Joined thread"); + } + } scripting::LuaLibrary SkyBrowserModule::luaLibrary() const {