summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2019-10-21 21:45:45 +0300
committerandreykproductengine <andreykproductengine@lindenlab.com>2019-10-21 21:45:45 +0300
commitcc32c70518d39e10ca365e384ade1aa17595d5e3 (patch)
tree3cbe1b41e5c18774fba0744c586579baaa9383d4
parentf60187d2240a3a09d78dc1e2a016820aa12f88ca (diff)
SL-12164 attempt to close viewer on window init resulted in crash
-rw-r--r--indra/newview/llappviewer.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 2a928a47a2..b704bf84a1 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3991,7 +3991,9 @@ static LLNotificationFunctorRegistration finish_quit_reg("ConfirmQuit", finish_q
void LLAppViewer::userQuit()
{
- if (gDisconnected || gViewerWindow->getProgressView()->getVisible())
+ if (gDisconnected
+ || !gViewerWindow
+ || (gViewerWindow->getProgressView() && gViewerWindow->getProgressView()->getVisible()))
{
requestQuit();
}