File tree 1 file changed +6
-1
lines changed
1 file changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -403,6 +403,7 @@ struct LLWindowWin32::LLWindowWin32Thread : public LL::ThreadPool
403
403
// until after some graphics setup. See SL-20177. -Cosmic,2023-09-18
404
404
bool mGLReady = false ;
405
405
bool mGotGLBuffer = false ;
406
+ bool mShuttingDown = false ;
406
407
};
407
408
408
409
@@ -4576,12 +4577,14 @@ inline LLWindowWin32::LLWindowWin32Thread::LLWindowWin32Thread()
4576
4577
4577
4578
void LLWindowWin32::LLWindowWin32Thread::close ()
4578
4579
{
4579
- if (mWindowHandleThrd )
4580
+ LL::ThreadPool::close ();
4581
+ if (!mShuttingDown )
4580
4582
{
4581
4583
LL_WARNS () << " Closing window thread without using destroy_window_handler" << LL_ENDL;
4582
4584
// Workaround for SL-18721 in case window closes too early and abruptly
4583
4585
LLSplashScreen::show ();
4584
4586
LLSplashScreen::update (" ..." ); // will be updated later
4587
+ mShuttingDown = true ;
4585
4588
}
4586
4589
}
4587
4590
@@ -4793,6 +4796,8 @@ void LLWindowWin32::LLWindowWin32Thread::wakeAndDestroy()
4793
4796
return ;
4794
4797
}
4795
4798
4799
+ mShuttingDown = true ;
4800
+
4796
4801
// Make sure we don't leave a blank toolbar button.
4797
4802
// Also hiding window now prevents user from suspending it
4798
4803
// via some action (like dragging it around)
You can’t perform that action at this time.
0 commit comments