diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-03-21 19:31:54 +0200 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-03-21 19:31:54 +0200 |
| commit | 36060a613a4372cb9c2c1938def2a2c137d917e4 (patch) | |
| tree | fd83224fa3482c229903924f685bfe57c28ee8ea /indra/newview | |
| parent | 75f5df57b444574d66725801c348100d6d7b9175 (diff) | |
MAINT-8417 Fixed startup crash in doFrame() after failing to access vfs cache
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index bd632c10dd..b15ea7d79f 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1399,7 +1399,8 @@ bool LLAppViewer::doFrame() // Scan keyboard for movement keys. Command keys and typing // are handled by windows callbacks. Don't do this until we're // done initializing. JC - if ((gHeadlessClient || gViewerWindow->getWindow()->getVisible()) + if (gViewerWindow + && (gHeadlessClient || gViewerWindow->getWindow()->getVisible()) && gViewerWindow->getActive() && !gViewerWindow->getWindow()->getMinimized() && LLStartUp::getStartupState() == STATE_STARTED |