summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2024-10-17 17:32:23 +0300
committerGitHub <noreply@github.com>2024-10-17 17:32:23 +0300
commit9927ac2561eaa4aed94bd82a90d006f614c6cf05 (patch)
tree52f71ccd087a93d259d89b4a9ed1ff1638e65c3d /indra
parent38c684b825d1280600787ecd628cadb53ef1498f (diff)
Resolve maint-c post merge shutdown issue (#2872)
Diffstat (limited to 'indra')
-rw-r--r--indra/llwindow/llwindowwin32.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index f8294f063f..6d8bbe281c 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -4576,11 +4576,9 @@ inline LLWindowWin32::LLWindowWin32Thread::LLWindowWin32Thread()
void LLWindowWin32::LLWindowWin32Thread::close()
{
- if (!mQueue->isClosed())
+ if (mWindowHandleThrd)
{
LL_WARNS() << "Closing window thread without using destroy_window_handler" << LL_ENDL;
- LL::ThreadPool::close();
-
// Workaround for SL-18721 in case window closes too early and abruptly
LLSplashScreen::show();
LLSplashScreen::update("..."); // will be updated later