From 0a0ba068bf5bc6d829440a12946174c6ed961843 Mon Sep 17 00:00:00 2001 From: Gilbert Gonzales Date: Fri, 15 Mar 2013 18:16:44 -0700 Subject: CHUI-852 ([crashhunters] crash in LLNotificationsUI::LLScreenChannel::addToast): Crash is due to a gesture not loading while the user is shutting down the app. A notification saying that the gesture couldn't load is trying to display while the app is shutting down, which causes a crash. --- indra/newview/lldelayedgestureerror.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'indra/newview/lldelayedgestureerror.cpp') diff --git a/indra/newview/lldelayedgestureerror.cpp b/indra/newview/lldelayedgestureerror.cpp index 80e7c9f1b2..ef1b644ad4 100644 --- a/indra/newview/lldelayedgestureerror.cpp +++ b/indra/newview/lldelayedgestureerror.cpp @@ -113,9 +113,11 @@ bool LLDelayedGestureError::doDialog(const LLErrorEntry &ent, bool uuid_ok) } } - - LLNotificationsUtil::add(ent.mNotifyName, args); - + if(!LLApp::isQuitting()) + { + LLNotificationsUtil::add(ent.mNotifyName, args); + } + return true; } -- cgit v1.2.3