From c0e8656477e41fffa26be9a23bef1c5bb1357330 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Fri, 13 Jul 2012 14:04:45 +0200
Subject: Crashfix: Stop notifications when we're about to exit.

---
 indra/newview/llnotificationmanager.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra/newview/llnotificationmanager.cpp')

diff --git a/indra/newview/llnotificationmanager.cpp b/indra/newview/llnotificationmanager.cpp
index f792f53ac5..3d8150eed3 100644
--- a/indra/newview/llnotificationmanager.cpp
+++ b/indra/newview/llnotificationmanager.cpp
@@ -97,6 +97,13 @@ bool LLNotificationManager::onNotification(const LLSD& notify)
 {
 	LLSysHandler* handle = NULL;
 
+	// Don't bother if we're going down.
+	// Otherwise we might crash when trying to use handlers that are already dead.
+	if( LLApp::isExiting() )
+	{
+		return false;
+	}
+
 	if (LLNotifications::destroyed())
 		return false;
 
-- 
cgit v1.2.3