diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-09-04 20:19:48 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-09-04 20:19:48 +0300 |
| commit | 94eeef729e14a452aaa952f2864b0a426727ced7 (patch) | |
| tree | f5737678e3ccb6717fb1c266cfc729417e003de5 | |
| parent | c2f0d67ab24993d160309c20d2446d58e5d86cb8 (diff) | |
MAINT-9082 crash on HandleFocusLost
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index cbda906599..4ee4a5357c 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -752,8 +752,6 @@ void LLWindowWin32::close() mDragDrop->reset(); - // Make sure cursor is visible and we haven't mangled the clipping state. - setMouseClipping(FALSE); // Go back to screen mode written in the registry. if (mFullscreen) @@ -763,13 +761,13 @@ void LLWindowWin32::close() // Don't process events in our mainWindowProc any longer. SetWindowLongPtr(mWindowHandle, GWLP_USERDATA, NULL); - if (mCallbacks) - { - mCallbacks->handleFocusLost(this); - } - else + + // Make sure cursor is visible and we haven't mangled the clipping state. + showCursor(); + setMouseClipping(FALSE); + if (gKeyboard) { - showCursor(); + gKeyboard->resetKeys(); } // Clean up remaining GL state |