From aeb0faec5bcc4f4083bfbce98fa2ddc8713e07a6 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 23 Feb 2015 19:21:10 +0100
Subject: [PATCH] FIRE-15609: More possible crash fixing for logout crash after
 using the particle editor

---
 indra/newview/particleeditor.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/indra/newview/particleeditor.cpp b/indra/newview/particleeditor.cpp
index 5815c2c134..f177a1198c 100644
--- a/indra/newview/particleeditor.cpp
+++ b/indra/newview/particleeditor.cpp
@@ -26,6 +26,7 @@
 #include <fstream>
 
 #include "llagent.h"
+#include "llappviewer.h"
 #include "llassetuploadresponders.h"
 #include "llcheckboxctrl.h"
 #include "llclipboard.h"
@@ -678,7 +679,7 @@ ParticleScriptCreationCallback::~ParticleScriptCreationCallback()
 
 void ParticleScriptCreationCallback::fire(const LLUUID& inventoryItem)
 {
-	if (mEditor)
+	if (!gDisconnected && !LLAppViewer::instance()->quitRequested() && mEditor)
 	{
 		mEditor->callbackReturned(inventoryItem);
 	}
@@ -699,7 +700,7 @@ ParticleScriptUploadResponder::ParticleScriptUploadResponder(const LLSD& post_da
 void ParticleScriptUploadResponder::uploadComplete(const LLSD& content)
 {
 	LLUpdateAgentInventoryResponder::uploadComplete(content);
-	if (mEditor)
+	if (!gDisconnected && !LLAppViewer::instance()->quitRequested() && mEditor)
 	{
 		mEditor->scriptInjectReturned(content);
 	}