summaryrefslogtreecommitdiff
path: root/indra/llwindow
diff options
context:
space:
mode:
authornat-goodspeed <nat@lindenlab.com>2023-05-10 09:14:14 -0400
committerGitHub <noreply@github.com>2023-05-10 09:14:14 -0400
commit69d444826d1feb58ae48f893083e22c01a50a93f (patch)
tree73c20febab8061217597ce21560152c800f7c7ab /indra/llwindow
parent0b1c0aa242db6e789e0706f5ebfb9c80f98da9d3 (diff)
parentf728808d938666a01f73a039c861358fc4b02a9e (diff)
Merge pull request #208 from secondlife/SL-19690
SL-19690: Follow up on Rye Mutt's fix for shutdown crashes.
Diffstat (limited to 'indra/llwindow')
-rw-r--r--indra/llwindow/llwindowwin32.cpp13
1 files changed, 4 insertions, 9 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 4530e34369..1f91cbbaa8 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -370,15 +370,10 @@ struct LLWindowWin32::LLWindowWin32Thread : public LL::ThreadPool
template <typename CALLABLE>
void post(CALLABLE&& func)
{
- try
- {
- getQueue().post(std::forward<CALLABLE>(func));
- }
- catch (const LLThreadSafeQueueInterrupt&)
- {
- // Shutdown timing is tricky. The main thread can end up trying
- // to post a cursor position after having closed the WorkQueue.
- }
+ // Ignore bool return. Shutdown timing is tricky: the main thread can
+ // end up trying to post a cursor position after having closed the
+ // WorkQueue.
+ getQueue().post(std::forward<CALLABLE>(func));
}
/**