From 36060a613a4372cb9c2c1938def2a2c137d917e4 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Wed, 21 Mar 2018 19:31:54 +0200 Subject: MAINT-8417 Fixed startup crash in doFrame() after failing to access vfs cache --- indra/newview/llappviewer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra') 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 -- cgit v1.2.3