Resolve maint-c post merge shutdown issue (#2872)

akleshchev · web-flow · commit 9927ac2561ea · 2024-10-17T17:32:23.000+03:00
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -4576,11 +4576,9 @@ inline LLWindowWin32::LLWindowWin32Thread::LLWindowWin32Thread()`
`4576`	`4576`
`4577`	`4577`	`void LLWindowWin32::LLWindowWin32Thread::close()`
`4578`	`4578`	`{`
`4579`		`- if (!mQueue->isClosed())`
	`4579`	`+ if (mWindowHandleThrd)`
`4580`	`4580`	`{`
`4581`	`4581`	`LL_WARNS() << "Closing window thread without using destroy_window_handler" << LL_ENDL;`
`4582`		`- LL::ThreadPool::close();`
`4583`		`-`
`4584`	`4582`	`// Workaround for SL-18721 in case window closes too early and abruptly`
`4585`	`4583`	`LLSplashScreen::show();`
`4586`	`4584`	`LLSplashScreen::update("..."); // will be updated later`