From 8a2b6f7d2e56625c59c3e40d4a23942a91b824a1 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 25 May 2012 12:04:12 -0700
Subject: CHUI-131 FIX Crash when selecting Show on inventory offer
 notification if other notifications are being received

---
 indra/newview/llscreenchannel.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp
index 157821d554..a4a0198305 100644
--- a/indra/newview/llscreenchannel.cpp
+++ b/indra/newview/llscreenchannel.cpp
@@ -499,15 +499,16 @@ void LLScreenChannel::killToastByNotificationID(LLUUID id)
 
 void LLScreenChannel::removeToastByNotificationID(LLUUID id)
 {
-	std::vector<ToastElem>::iterator it = mToastList.begin();
+	std::vector<ToastElem>::iterator it = find(mToastList.begin(), mToastList.end(), id);
 	while( it != mToastList.end())
 	{
-		// find next toast with matching id
-		it = find(it, mToastList.end(), id);
 		deleteToast(it->getToast());
 		mToastList.erase(it);
 		redrawToasts();
+		// find next toast with matching id
+		it = find(mToastList.begin(), mToastList.end(), id);
 	}
+
 	it = find(mStoredToastList.begin(), mStoredToastList.end(), id);
 	if (it != mStoredToastList.end())
 	{
-- 
cgit v1.2.3