diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2021-11-15 14:34:30 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2021-11-15 14:34:30 -0500 |
| commit | a633efdc0b62f28f145ec26c2efa8dfc06a3729e (patch) | |
| tree | f320cd1260ab7764fbbf1f75c933de2ace24d55f /indra/llwindow/llwindowwin32.h | |
| parent | 1a39a8f7d953a28b03bad0921a8877e21e1e2c61 (diff) | |
SL-16094: In LLWindowWin32::recreateWindow(), kick window thread
before blocking on the pending future. Otherwise the window thread can remain
blocked in a GetMessage() call and deadlock the app.
Diffstat (limited to 'indra/llwindow/llwindowwin32.h')
| -rw-r--r-- | indra/llwindow/llwindowwin32.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h index 5966061177..b02815e990 100644 --- a/indra/llwindow/llwindowwin32.h +++ b/indra/llwindow/llwindowwin32.h @@ -244,6 +244,7 @@ protected: void post(const std::function<void()>& func); void postMouseButtonEvent(const std::function<void()>& func); void recreateWindow(RECT window_rect, DWORD dw_ex_style, DWORD dw_style); + void kickWindowThread(HWND windowHandle=0); friend class LLWindowManager; }; |