diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-08-06 17:46:53 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-08-06 17:46:53 +0300 |
| commit | c27e20703366ceb8a536c0a4ca22645500f426eb (patch) | |
| tree | fc0b9ed88ea8ea33bce6788f86d2a79ba555975f /indra/newview/llappviewer.cpp | |
| parent | 00acc562f929eaa0f89386d97786815e56742d26 (diff) | |
SL-13737 Crash when cleaning up uninitialized ndof device
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index cf9ad7ccbf..75574df00e 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1851,8 +1851,11 @@ bool LLAppViewer::cleanup() delete gKeyboard; gKeyboard = NULL; - // Turn off Space Navigator and similar devices - LLViewerJoystick::getInstance()->terminate(); + if (LLViewerJoystick::instanceExists()) + { + // Turn off Space Navigator and similar devices + LLViewerJoystick::getInstance()->terminate(); + } LL_INFOS() << "Cleaning up Objects" << LL_ENDL; |